From 1b00796f64ab265f59d0ebe5c78c2d04f19cdfd0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 20 Nov 2016 17:28:51 +0100 Subject: [PATCH] Turn video_shader_driver_set_parameter to macro --- gfx/video_shader_driver.c | 9 --------- gfx/video_shader_driver.h | 4 +++- menu/drivers_display/menu_display_d3d.cpp | 2 +- menu/drivers_display/menu_display_gl.c | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gfx/video_shader_driver.c b/gfx/video_shader_driver.c index 53091fa47b..528d5b37c0 100644 --- a/gfx/video_shader_driver.c +++ b/gfx/video_shader_driver.c @@ -137,15 +137,6 @@ bool video_shader_driver_deinit(void) return true; } -bool video_shader_driver_set_parameter(struct uniform_info *param) -{ - if (!current_shader || !param) - return false; - current_shader->set_uniform_parameter(shader_data, - param, NULL); - 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 eeacad34f9..fb15b17ebc 100644 --- a/gfx/video_shader_driver.h +++ b/gfx/video_shader_driver.h @@ -277,7 +277,9 @@ bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader); bool video_shader_driver_deinit(void); -bool video_shader_driver_set_parameter(struct uniform_info *param); +#define video_shader_driver_set_parameter(param) \ + if (current_shader && current_shader->set_uniform_parameter) \ + current_shader->set_uniform_parameter(shader_data, ¶m, NULL) #define video_shader_driver_set_parameters(params) \ if (current_shader && current_shader->set_params) \ diff --git a/menu/drivers_display/menu_display_d3d.cpp b/menu/drivers_display/menu_display_d3d.cpp index efdbb37e82..9338b61ba1 100644 --- a/menu/drivers_display/menu_display_d3d.cpp +++ b/menu/drivers_display/menu_display_d3d.cpp @@ -221,7 +221,7 @@ static void menu_display_d3d_draw_pipeline(void *data) uniform_param.lookup.ident = "time"; uniform_param.result.f.v0 = t; - video_shader_driver_set_parameter(&uniform_param); + video_shader_driver_set_parameter(uniform_param); break; } #endif diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c index 52741649d8..b520a52ec8 100644 --- a/menu/drivers_display/menu_display_gl.c +++ b/menu/drivers_display/menu_display_gl.c @@ -192,7 +192,7 @@ static void menu_display_gl_draw_pipeline(void *data) uniform_param.lookup.ident = "time"; uniform_param.result.f.v0 = t; - video_shader_driver_set_parameter(&uniform_param); + video_shader_driver_set_parameter(uniform_param); } break; }