mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 03:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor macro functions which were unsafe

Browse Source
This commit is contained in:
twinaphex 2018-02-26 18:08:17 +01:00
parent b67777f664
commit 696fa900a1
6 changed files with 61 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/drivers/gl.c
View File

@ -610,7 +610,7 @@ static INLINE void gl_set_shader_viewports(gl_t *gl)
shader_info.idx = 0;
shader_info.set_active = true;
video_shader_driver_use(shader_info);
video_shader_driver_use(&shader_info);
gl_set_viewport_wrapper(gl, width, height, false, true);
@ -618,7 +618,7 @@ static INLINE void gl_set_shader_viewports(gl_t *gl)
shader_info.idx = 1;
shader_info.set_active = true;
video_shader_driver_use(shader_info);
video_shader_driver_use(&shader_info);
gl_set_viewport_wrapper(gl, width, height, false, true);
}
@ -829,7 +829,7 @@ static void gl_render_osd_background(
uniform_param.result.f.v2 = colors[2];
uniform_param.result.f.v3 = colors[3];
video_shader_driver_set_parameter(uniform_param);
video_shader_driver_set_parameter(&uniform_param);
glDrawArrays(GL_TRIANGLES, 0, coords.vertices);
@ -839,7 +839,7 @@ static void gl_render_osd_background(
uniform_param.result.f.v2 = 0.0f;
uniform_param.result.f.v3 = 0.0f;
video_shader_driver_set_parameter(uniform_param);
video_shader_driver_set_parameter(&uniform_param);
free(dummy);
free(verts);

2
gfx/drivers_font/gl_raster_font.c
View File

@ -408,7 +408,7 @@ static void gl_raster_font_setup_viewport(unsigned width, unsigned height,
shader_info.idx = VIDEO_SHADER_STOCK_BLEND;
shader_info.set_active = true;
video_shader_driver_use(shader_info);
video_shader_driver_use(&shader_info);
}
static void gl_raster_font_render_msg(

4
gfx/drivers_renderchain/gl2_renderchain.c
View File

@ -377,7 +377,7 @@ static void gl2_renderchain_render(
shader_info.idx = i + 1;
shader_info.set_active = true;
video_shader_driver_use(shader_info);
video_shader_driver_use(&shader_info);
glBindTexture(GL_TEXTURE_2D, chain->fbo_texture[i - 1]);
mip_level = i + 1;
@ -451,7 +451,7 @@ static void gl2_renderchain_render(
shader_info.idx = chain->fbo_pass + 1;
shader_info.set_active = true;
video_shader_driver_use(shader_info);
video_shader_driver_use(&shader_info);
glBindTexture(GL_TEXTURE_2D, chain->fbo_texture[chain->fbo_pass - 1]);

68
gfx/video_driver.c
View File

@ -225,8 +225,8 @@ static gfx_ctx_flags_t deferred_flag_data = {0};
static enum gfx_ctx_api current_video_context_api = GFX_CTX_NONE;
shader_backend_t *current_shader = NULL;
void *shader_data = NULL;
static shader_backend_t *current_shader = NULL;
static void *current_shader_data = NULL;
struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END] = {
{ "4:3", 1.3333f },
@ -2701,7 +2701,7 @@ void video_driver_build_info(video_frame_info_t *video_info)
video_info->input_driver_nonblock_state = input_driver_is_nonblock_state();
video_info->context_data = video_context_data;
video_info->shader_data = shader_data;
video_info->shader_data = current_shader_data;
video_info->cb_update_window_title = current_video_context.update_window_title;
video_info->cb_swap_buffers = current_video_context.swap_buffers;
@ -3276,17 +3276,41 @@ static const shader_backend_t *video_shader_set_backend(enum rarch_shader_type t
return NULL;
}
void video_shader_driver_set_parameters(video_shader_ctx_params_t *params)
void video_shader_driver_use(void *data)
{
if (current_shader && current_shader->use)
{
video_shader_ctx_info_t *shader_info =
(video_shader_ctx_info_t*)data;
current_shader->use(shader_info->data, current_shader_data,
shader_info->idx, shader_info->set_active);
}
}
void video_shader_driver_set_parameter(void *data)
{
if (current_shader && current_shader->set_uniform_parameter)
{
struct uniform_info *param = (struct uniform_info*)data;
current_shader->set_uniform_parameter(current_shader_data,
param, NULL);
}
}
void video_shader_driver_set_parameters(void *data)
{
if (current_shader && current_shader->set_params)
current_shader->set_params(params, shader_data);
{
video_shader_ctx_params_t *params = (video_shader_ctx_params_t*)data;
current_shader->set_params(params, current_shader_data);
}
}
bool video_shader_driver_get_prev_textures(video_shader_ctx_texture_t *texture)
{
if (!texture || !current_shader)
return false;
texture->id = current_shader->get_prev_textures(shader_data);
texture->id = current_shader->get_prev_textures(current_shader_data);
return true;
}
@ -3313,7 +3337,7 @@ bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader)
bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader)
{
shader->data = current_shader->get_current_shader(shader_data);
shader->data = current_shader->get_current_shader(current_shader_data);
return true;
}
@ -3324,9 +3348,9 @@ bool video_shader_driver_deinit(void)
return false;
if (current_shader->deinit)
current_shader->deinit(shader_data);
current_shader->deinit(current_shader_data);
shader_data = NULL;
current_shader_data = NULL;
current_shader = NULL;
return true;
}
@ -3454,8 +3478,8 @@ bool video_shader_driver_init(video_shader_ctx_init_t *init)
if (!tmp)
return false;
shader_data = tmp;
current_shader = (shader_backend_t*)init->shader;
current_shader_data = tmp;
current_shader = (shader_backend_t*)init->shader;
video_shader_driver_reset_to_defaults();
return true;
@ -3463,12 +3487,12 @@ bool video_shader_driver_init(video_shader_ctx_init_t *init)
bool video_shader_driver_get_feedback_pass(unsigned *data)
{
return current_shader->get_feedback_pass(shader_data, data);
return current_shader->get_feedback_pass(current_shader_data, data);
}
bool video_shader_driver_mipmap_input(unsigned *index)
{
return current_shader->mipmap_input(shader_data, *index);
return current_shader->mipmap_input(current_shader_data, *index);
}
bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler)
@ -3478,7 +3502,8 @@ bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler)
scaler->scale->valid = false;
current_shader->shader_scale(shader_data, scaler->idx, scaler->scale);
current_shader->shader_scale(current_shader_data,
scaler->idx, scaler->scale);
return true;
}
@ -3487,7 +3512,7 @@ bool video_shader_driver_info(video_shader_ctx_info_t *shader_info)
if (!shader_info)
return false;
shader_info->num = current_shader->num_shaders(shader_data);
shader_info->num = current_shader->num_shaders(current_shader_data);
return true;
}
@ -3495,7 +3520,7 @@ bool video_shader_driver_info(video_shader_ctx_info_t *shader_info)
bool video_shader_driver_filter_type(video_shader_ctx_filter_t *filter)
{
if (filter)
return current_shader->filter_type(shader_data,
return current_shader->filter_type(current_shader_data,
filter->index, filter->smooth);
return false;
}
@ -3511,7 +3536,8 @@ bool video_shader_driver_compile_program(
bool video_shader_driver_wrap_type(video_shader_ctx_wrap_t *wrap)
{
wrap->type = current_shader->wrap_type(shader_data, wrap->idx);
wrap->type = current_shader->wrap_type(
current_shader_data, wrap->idx);
return true;
}
@ -3519,12 +3545,12 @@ void video_driver_set_coords(video_shader_ctx_coords_t *coords)
{
if (current_shader && current_shader->set_coords)
current_shader->set_coords(coords->handle_data,
shader_data, (const struct video_coords*)coords->data);
current_shader_data, (const struct video_coords*)coords->data);
else
{
if (video_driver_poke && video_driver_poke->set_coords)
video_driver_poke->set_coords(coords->handle_data,
shader_data, (const struct video_coords*)coords->data);
current_shader_data, (const struct video_coords*)coords->data);
}
}
@ -3534,10 +3560,10 @@ void video_driver_set_mvp(video_shader_ctx_mvp_t *mvp)
return;
if (current_shader && current_shader->set_mvp)
current_shader->set_mvp(mvp->data, shader_data, mvp->matrix);
current_shader->set_mvp(mvp->data, current_shader_data, mvp->matrix);
else
{
if (video_driver_poke && video_driver_poke->set_mvp)
video_driver_poke->set_mvp(mvp->data, shader_data, mvp->matrix);
video_driver_poke->set_mvp(mvp->data, current_shader_data, mvp->matrix);
}
}

12
gfx/video_driver.h
View File

@ -1270,11 +1270,9 @@ bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader);
bool video_shader_driver_deinit(void);
#define video_shader_driver_set_parameter(param) \
if (current_shader && current_shader->set_uniform_parameter) \
current_shader->set_uniform_parameter(shader_data, &param, NULL)
void video_shader_driver_set_parameter(void *data);
void video_shader_driver_set_parameters(video_shader_ctx_params_t *params);
void video_shader_driver_set_parameters(void *data);
bool video_shader_driver_init_first(void);
@ -1296,16 +1294,12 @@ bool video_shader_driver_filter_type(video_shader_ctx_filter_t *filter);
bool video_shader_driver_compile_program(struct shader_program_info *program_info);
#define video_shader_driver_use(shader_info) \
current_shader->use(shader_info.data, shader_data, shader_info.idx, shader_info.set_active)
void video_shader_driver_use(void *data);
bool video_shader_driver_wrap_type(video_shader_ctx_wrap_t *wrap);
extern bool (*video_driver_cb_has_focus)(void);
extern shader_backend_t *current_shader;
extern void *shader_data;
extern video_driver_t video_gl;
extern video_driver_t video_vulkan;
extern video_driver_t video_psp1;

8
menu/drivers_display/menu_display_gl.c
View File

@ -88,7 +88,7 @@ static void menu_display_gl_blend_begin(video_frame_info_t *video_info)
shader_info.idx = VIDEO_SHADER_STOCK_BLEND;
shader_info.set_active = true;
video_shader_driver_use(shader_info);
video_shader_driver_use(&shader_info);
}
static void menu_display_gl_blend_end(video_frame_info_t *video_info)
@ -189,7 +189,7 @@ static void menu_display_gl_draw_pipeline(void *data,
shader_info.idx = draw->pipeline.id;
shader_info.set_active = true;
video_shader_driver_use(shader_info);
video_shader_driver_use(&shader_info);
t += 0.01;
@ -206,7 +206,7 @@ static void menu_display_gl_draw_pipeline(void *data,
uniform_param.result.f.v0 = t;
video_shader_driver_set_parameter(uniform_param);
video_shader_driver_set_parameter(&uniform_param);
break;
}
@ -222,7 +222,7 @@ static void menu_display_gl_draw_pipeline(void *data,
uniform_param.result.f.v0 = draw->width;
uniform_param.result.f.v1 = draw->height;
video_shader_driver_set_parameter(uniform_param);
video_shader_driver_set_parameter(&uniform_param);
#endif
break;
}