diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index f2f65fa671..bfbe2cfb37 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -1517,10 +1517,12 @@ static void d3d_overlay_vertex_geom(void *data, } static bool d3d_overlay_load(void *data, - const texture_image *images, unsigned num_images) + const void *image_data, unsigned num_images) { unsigned i, y; d3d_video_t *d3d = (d3d_video_t*)data; + const texture_image *images = (const texture_image*) + image_data; if (!d3d) return false; diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 8f705c2d24..87cb9d3383 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -2900,10 +2900,12 @@ unsigned *height_p, size_t *pitch_p) #ifdef HAVE_OVERLAY static void gl_free_overlay(gl_t *gl); static bool gl_overlay_load(void *data, - const struct texture_image *images, unsigned num_images) + const void *image_data, unsigned num_images) { unsigned i, j; gl_t *gl = (gl_t*)data; + const struct texture_image *images = + (const struct texture_image*)image_data; if (!gl) return false; diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c index 407a0ba320..f957f0717c 100644 --- a/gfx/drivers/gx_gfx.c +++ b/gfx/drivers/gx_gfx.c @@ -1341,10 +1341,12 @@ static void gx_get_poke_interface(void *data, const video_poke_interface_t **ifa #ifdef HAVE_OVERLAY static void gx_overlay_tex_geom(void *data, unsigned image, float x, float y, float w, float h); static void gx_overlay_vertex_geom(void *data, unsigned image, float x, float y, float w, float h); -static bool gx_overlay_load(void *data, const struct texture_image *images, unsigned num_images) + +static bool gx_overlay_load(void *data, const void *image_data, unsigned num_images) { unsigned i; gx_video_t *gx = (gx_video_t*)data; + const struct texture_image *images = (const struct texture_image*)image_data; gx_free_overlay(gx); gx->overlay = (struct gx_overlay_data*)calloc(num_images, sizeof(*gx->overlay)); diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c index 6585543483..38feeb9374 100644 --- a/gfx/video_thread_wrapper.c +++ b/gfx/video_thread_wrapper.c @@ -750,10 +750,12 @@ static void thread_overlay_enable(void *data, bool state) } static bool thread_overlay_load(void *data, - const struct texture_image *images, unsigned num_images) + const void *image_data, unsigned num_images) { thread_video_t *thr = (thread_video_t*)data; thread_packet_t pkt = { CMD_OVERLAY_LOAD }; + const struct texture_image *images = + (const struct texture_image*)image_data; if (!thr) return false; diff --git a/input/input_overlay.c b/input/input_overlay.c index ecdf6b4f6c..89a6b859ed 100644 --- a/input/input_overlay.c +++ b/input/input_overlay.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include diff --git a/input/input_overlay.h b/input/input_overlay.h index 15921f762e..f649ddd5df 100644 --- a/input/input_overlay.h +++ b/input/input_overlay.h @@ -21,8 +21,6 @@ #include #include -#include - #include "../libretro.h" #ifdef __cplusplus @@ -47,7 +45,7 @@ typedef struct video_overlay_interface { void (*enable)(void *data, bool state); bool (*load)(void *data, - const struct texture_image *images, unsigned num_images); + const void *images, unsigned num_images); void (*tex_geom)(void *data, unsigned image, float x, float y, float w, float h); void (*vertex_geom)(void *data, unsigned image,