From 641a37ce06f3a897ab92e78678150851025ac260 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 17 Apr 2016 05:00:42 +0200 Subject: [PATCH] Change some function parameters for gl_ff_matrix/gl_ff_vertex --- gfx/common/gl_common.c | 7 ++----- gfx/common/gl_common.h | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gfx/common/gl_common.c b/gfx/common/gl_common.c index 0303f060cb..30ebd6d982 100644 --- a/gfx/common/gl_common.c +++ b/gfx/common/gl_common.c @@ -23,11 +23,9 @@ extern void gl_load_texture_data(uint32_t id_data, unsigned width, unsigned height, const void *frame, unsigned base_size); -void gl_ff_vertex(const void *data) +void gl_ff_vertex(const struct gfx_coords *coords) { #ifndef NO_GL_FF_VERTEX - const struct gfx_coords *coords = (const struct gfx_coords*)data; - /* Fall back to fixed function-style if needed and possible. */ glClientActiveTexture(GL_TEXTURE1); glTexCoordPointer(2, GL_FLOAT, 0, coords->lut_tex_coord); @@ -42,11 +40,10 @@ void gl_ff_vertex(const void *data) #endif } -void gl_ff_matrix(const void *data) +void gl_ff_matrix(const math_matrix_4x4 *mat) { #ifndef NO_GL_FF_MATRIX math_matrix_4x4 ident; - const math_matrix_4x4 *mat = (const math_matrix_4x4*)data; /* Fall back to fixed function-style if needed and possible. */ glMatrixMode(GL_PROJECTION); diff --git a/gfx/common/gl_common.h b/gfx/common/gl_common.h index e08423532e..fba6b5c182 100644 --- a/gfx/common/gl_common.h +++ b/gfx/common/gl_common.h @@ -339,7 +339,7 @@ static INLINE unsigned gl_wrap_type_to_enum(enum gfx_wrap_type type) return 0; } -void gl_ff_vertex(const void *data); -void gl_ff_matrix(const void *data); +void gl_ff_vertex(const struct gfx_coords *coords); +void gl_ff_matrix(const math_matrix_4x4 *mat); #endif