Rename function callback

This commit is contained in:
twinaphex 2017-11-16 12:02:08 +01:00
parent 1dc19d347c
commit bfd815985f
5 changed files with 9 additions and 9 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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;

View File

@ -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;