diff --git a/gfx/drivers/d3d_renderchains/render_chain_xdk.cpp b/gfx/drivers/d3d_renderchains/render_chain_xdk.cpp index f2eb59f7ca..45ab2386ff 100644 --- a/gfx/drivers/d3d_renderchains/render_chain_xdk.cpp +++ b/gfx/drivers/d3d_renderchains/render_chain_xdk.cpp @@ -241,7 +241,7 @@ static void renderchain_set_vertices(void *data, unsigned pass, params.fbo_info = NULL; params.fbo_info_cnt = 0; - video_shader_driver_set_parameters(¶ms); + video_shader_driver_set_parameters(params); #endif #endif } diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index be62402990..d58ca046e3 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -1241,7 +1241,7 @@ static bool gl_frame(void *data, const void *frame, params.fbo_info = NULL; params.fbo_info_cnt = 0; - video_shader_driver_set_parameters(¶ms); + video_shader_driver_set_parameters(params); gl->coords.vertices = 4; coords.handle_data = NULL; diff --git a/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c b/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c index cd5c5058eb..52968bddad 100644 --- a/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c +++ b/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c @@ -330,7 +330,7 @@ void gl_renderchain_render(gl_t *gl, params.fbo_info = fbo_tex_info; params.fbo_info_cnt = fbo_tex_info_cnt; - video_shader_driver_set_parameters(¶ms); + video_shader_driver_set_parameters(params); gl->coords.vertices = 4; @@ -404,7 +404,7 @@ void gl_renderchain_render(gl_t *gl, params.fbo_info = fbo_tex_info; params.fbo_info_cnt = fbo_tex_info_cnt; - video_shader_driver_set_parameters(¶ms); + video_shader_driver_set_parameters(params); gl->coords.vertex = gl->vertex_ptr; diff --git a/gfx/video_shader_driver.c b/gfx/video_shader_driver.c index 8329e5cc77..2834337fee 100644 --- a/gfx/video_shader_driver.c +++ b/gfx/video_shader_driver.c @@ -146,28 +146,6 @@ bool video_shader_driver_set_parameter(struct uniform_info *param) return true; } -bool video_shader_driver_set_parameters(video_shader_ctx_params_t *params) -{ - if (!current_shader || !current_shader->set_params) - return false; - current_shader->set_params( - params->data, - shader_data, - params->width, - params->height, - params->tex_width, - params->tex_height, - params->out_width, - params->out_height, - params->frame_counter, - params->info, - params->prev_info, - params->feedback_info, - params->fbo_info, - params->fbo_info_cnt); - return true; -} - /* Finds first suitable shader context driver. */ bool video_shader_driver_init_first(void) { diff --git a/gfx/video_shader_driver.h b/gfx/video_shader_driver.h index e117be5f54..a31959cd19 100644 --- a/gfx/video_shader_driver.h +++ b/gfx/video_shader_driver.h @@ -279,7 +279,9 @@ bool video_shader_driver_deinit(void); bool video_shader_driver_set_parameter(struct uniform_info *param); -bool video_shader_driver_set_parameters(video_shader_ctx_params_t *params); +#define video_shader_driver_set_parameters(params) \ + if (current_shader && current_shader->set_params) \ + current_shader->set_params(params.data, shader_data, params.width, params.height, params.tex_width, params.tex_height, params.out_width, params.out_height, params.frame_counter, params.info, params.prev_info, params.feedback_info, params.fbo_info, params.fbo_info_cnt) bool video_shader_driver_init_first(void);