From bfd815985f0a8b819ac1481980e6d0cf998fda72 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 16 Nov 2017 12:02:08 +0100 Subject: [PATCH] Rename function callback --- gfx/drivers/gl.c | 8 ++++---- gfx/drivers_font/gl_raster_font.c | 2 +- gfx/drivers_renderchain/gl2_renderchain.c | 4 ++-- gfx/video_driver.c | 2 +- gfx/video_driver.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 6dced6ce3a..8aa957ce29 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -222,7 +222,7 @@ static void gl_render_overlay(gl_t *gl, video_frame_info_t *video_info) video_driver_set_coords(&coords); - video_info->cb_shader_set_mvp(gl, + video_info->cb_set_mvp(gl, video_info->shader_data, &gl->mvp_no_rot); for (i = 0; i < gl->overlays; i++) @@ -821,7 +821,7 @@ static void gl_render_osd_background( glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendEquation(GL_FUNC_ADD); - video_info->cb_shader_set_mvp(gl, + video_info->cb_set_mvp(gl, video_info->shader_data, &gl->mvp_no_rot); uniform_param.type = UNIFORM_4F; @@ -949,7 +949,7 @@ static INLINE void gl_draw_texture(gl_t *gl, video_frame_info_t *video_info) video_driver_set_coords(&coords); - video_info->cb_shader_set_mvp(gl, + video_info->cb_set_mvp(gl, video_info->shader_data, &gl->mvp_no_rot); glEnable(GL_BLEND); @@ -1131,7 +1131,7 @@ static bool gl_frame(void *data, const void *frame, video_driver_set_coords(&coords); - video_info->cb_shader_set_mvp(gl, video_info->shader_data, &gl->mvp); + video_info->cb_set_mvp(gl, video_info->shader_data, &gl->mvp); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c index 8dc9f6fc16..16a2bbc55f 100644 --- a/gfx/drivers_font/gl_raster_font.c +++ b/gfx/drivers_font/gl_raster_font.c @@ -260,7 +260,7 @@ static void gl_raster_font_draw_vertices(gl_raster_t *font, const video_coords_t video_driver_set_coords(&coords_data); - video_info->cb_shader_set_mvp(font->gl, + video_info->cb_set_mvp(font->gl, video_info->shader_data, &font->gl->mvp_no_rot); glDrawArrays(GL_TRIANGLES, 0, coords->vertices); diff --git a/gfx/drivers_renderchain/gl2_renderchain.c b/gfx/drivers_renderchain/gl2_renderchain.c index f6e6333cc5..0c9733e35f 100644 --- a/gfx/drivers_renderchain/gl2_renderchain.c +++ b/gfx/drivers_renderchain/gl2_renderchain.c @@ -333,7 +333,7 @@ static void gl2_renderchain_render( video_driver_set_coords(&coords); - video_info->cb_shader_set_mvp(gl, + video_info->cb_set_mvp(gl, video_info->shader_data, &gl->mvp); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); @@ -408,7 +408,7 @@ static void gl2_renderchain_render( video_driver_set_coords(&coords); - video_info->cb_shader_set_mvp(gl, + video_info->cb_set_mvp(gl, video_info->shader_data, &gl->mvp); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 60aee35340..24dbe8525a 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -2590,7 +2590,7 @@ void video_driver_build_info(video_frame_info_t *video_info) video_info->cb_set_resize = current_video_context.set_resize; video_info->cb_shader_use = video_driver_cb_shader_use; - video_info->cb_shader_set_mvp = video_driver_cb_shader_set_mvp; + video_info->cb_set_mvp = video_driver_cb_shader_set_mvp; #if 0 video_info->cb_set_coords = video_driver_cb_set_coords; diff --git a/gfx/video_driver.h b/gfx/video_driver.h index 69970be4bb..0267c11e6d 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -470,7 +470,7 @@ typedef struct video_frame_info bool (*cb_set_coords)(void *handle_data, void *shader_data, const struct video_coords *coords); #endif - bool (*cb_shader_set_mvp)(void *data, void *shader_data, + bool (*cb_set_mvp)(void *data, void *shader_data, const void *mat_data); void *context_data;