Make input_overlay.h no longer depend on RPNG image

This commit is contained in:
twinaphex 2015-07-11 08:14:39 +02:00
parent 1b163e6a5a
commit c3f5ea0fcc
6 changed files with 14 additions and 7 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -23,6 +23,7 @@
#include <file/file_path.h>
#include <string/string_list.h>
#include <file/config_file.h>
#include <formats/image.h>
#include <clamping.h>
#include <rhash.h>

View File

@ -21,8 +21,6 @@
#include <boolean.h>
#include <retro_miscellaneous.h>
#include <formats/image.h>
#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,