Turn video_shader_driver_set_coords into macro

This commit is contained in:
twinaphex 2016-11-20 16:48:54 +01:00
parent ef610312e7
commit 856d6b37be
7 changed files with 11 additions and 20 deletions

View File

@ -244,7 +244,7 @@ static void gl_render_overlay(gl_t *gl)
coords.handle_data = NULL;
coords.data = &gl->coords;
video_shader_driver_set_coords(&coords);
video_shader_driver_set_coords(coords);
mvp.data = gl;
mvp.matrix = &gl->mvp_no_rot;
@ -521,7 +521,6 @@ static void gl_update_input_size(gl_t *gl, unsigned width,
GLfloat xamt, yamt;
bool set_coords = false;
if ((width != gl->last_width[gl->tex_index] ||
height != gl->last_height[gl->tex_index]) && gl->empty_buf)
{
@ -1048,7 +1047,7 @@ static INLINE void gl_draw_texture(gl_t *gl)
coords.handle_data = NULL;
coords.data = &gl->coords;
video_shader_driver_set_coords(&coords);
video_shader_driver_set_coords(coords);
mvp.data = gl;
mvp.matrix = &gl->mvp_no_rot;
@ -1247,7 +1246,7 @@ static bool gl_frame(void *data, const void *frame,
coords.handle_data = NULL;
coords.data = &gl->coords;
video_shader_driver_set_coords(&coords);
video_shader_driver_set_coords(coords);
mvp.data = gl;
mvp.matrix = &gl->mvp;

View File

@ -337,7 +337,7 @@ void gl_renderchain_render(gl_t *gl,
coords.handle_data = NULL;
coords.data = &gl->coords;
video_shader_driver_set_coords(&coords);
video_shader_driver_set_coords(coords);
mvp.data = gl;
mvp.matrix = &gl->mvp;
@ -413,7 +413,7 @@ void gl_renderchain_render(gl_t *gl,
coords.handle_data = NULL;
coords.data = &gl->coords;
video_shader_driver_set_coords(&coords);
video_shader_driver_set_coords(coords);
mvp.data = gl;
mvp.matrix = &gl->mvp;

View File

@ -259,7 +259,7 @@ static void gl_raster_font_draw_vertices(gl_raster_t *font, const video_coords_t
coords_data.handle_data = NULL;
coords_data.data = coords;
video_shader_driver_set_coords(&coords_data);
video_shader_driver_set_coords(coords_data);
mvp.data = font->gl;
mvp.matrix = &font->gl->mvp_no_rot;

View File

@ -199,16 +199,6 @@ bool video_shader_driver_mipmap_input(unsigned *index)
return false;
}
bool video_shader_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))
return true;
return false;
}
bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler)
{
if (!scaler || !scaler->scale)

View File

@ -291,7 +291,9 @@ bool video_shader_driver_get_feedback_pass(unsigned *data);
bool video_shader_driver_mipmap_input(unsigned *index);
bool video_shader_driver_set_coords(video_shader_ctx_coords_t *coords);
#define video_shader_driver_set_coords(coords) \
if (current_shader && current_shader->set_coords) \
current_shader->set_coords(coords.handle_data, shader_data, (const struct video_coords*)coords.data)
bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler);

View File

@ -174,7 +174,7 @@ static void menu_display_d3d_draw(void *data)
if (!mat)
mat = (math_matrix_4x4*)
menu_display_d3d_get_default_mvp();
video_shader_driver_set_coords(d3d, draw->coords);
video_shader_driver_set_coords(draw->coords);
video_shader_driver_set_mvp(mat);
#endif

View File

@ -140,7 +140,7 @@ static void menu_display_gl_draw(void *data)
coords.handle_data = gl;
coords.data = draw->coords;
video_shader_driver_set_coords(&coords);
video_shader_driver_set_coords(coords);
mvp.data = gl;
mvp.matrix = draw->matrix_data ? (math_matrix_4x4*)draw->matrix_data