From 6362c86c31cdc87e93d7c2a59cc8d40ded0ae15f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 20 Dec 2015 21:08:03 +0100 Subject: [PATCH] Buildfixes --- gfx/d3d/d3d.cpp | 16 +++++++++++----- gfx/drivers/gl.c | 6 +++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index b3e0e52199..8f3a96a823 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -99,6 +99,7 @@ static void d3d_free_overlay(d3d_video_t *d3d, overlay_t *overlay); static void d3d_deinit_chain(d3d_video_t *d3d) { + if (d3d && d3d->renderchain_driver && d3d->renderchain_driver->chain_free) d3d->renderchain_driver->chain_free(d3d->renderchain_data); d3d->renderchain_driver = NULL; @@ -1698,19 +1699,23 @@ static void video_texture_load_d3d(struct texture_image *ti, static int video_texture_load_wrap_d3d_mipmap(void *data) { - return video_texture_load_d3d(data, TEXTURE_BACKEND_DIRECT3D, - TEXTURE_FILTER_MIPMAP_LINEAR); + uintptr_t id = 0; + video_texture_load_d3d((texture_image*)data, TEXTURE_FILTER_MIPMAP_LINEAR, &id); + return id; } static int video_texture_load_wrap_d3d(void *data) { - return video_texture_load_d3d(data, TEXTURE_BACKEND_DIRECT3D, - TEXTURE_FILTER_LINEAR); + uintptr_t id = 0; + video_texture_load_d3d((texture_image*)data, TEXTURE_FILTER_LINEAR, &id); + return id; } static unsigned d3d_load_texture(void *video_data, void *data, bool threaded, enum texture_filter_type filter_type) { + uintptr_t id = 0; + if (threaded) { custom_command_method_t func = video_texture_load_wrap_d3d; @@ -1731,7 +1736,8 @@ static unsigned d3d_load_texture(void *video_data, void *data, return rarch_threaded_video_texture_load(data, func); } - return video_texture_load_d3d(data, type, filter_type); + video_texture_load_d3d((texture_image*)data, filter_type, &id); + return id; } static void d3d_unload_texture(void *data, uintptr_t *id) diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 7007f6f378..b485bb24a0 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -3498,7 +3498,7 @@ static int video_texture_load_wrap_gl_mipmap(void *data) if (!data) return 0; - video_texture_load_gl(data, TEXTURE_FILTER_MIPMAP_LINEAR, &id); + video_texture_load_gl((struct texture_image*)data, TEXTURE_FILTER_MIPMAP_LINEAR, &id); return id; } @@ -3508,7 +3508,7 @@ static int video_texture_load_wrap_gl(void *data) if (!data) return 0; - video_texture_load_gl(data, TEXTURE_FILTER_LINEAR, &id); + video_texture_load_gl((struct texture_image*)data, TEXTURE_FILTER_LINEAR, &id); return id; } @@ -3533,7 +3533,7 @@ static unsigned gl_load_texture(void *video_data, void *data, return rarch_threaded_video_texture_load(data, func); } - video_texture_load_gl(data, filter_type, &id); + video_texture_load_gl((struct texture_image*)data, filter_type, &id); return id; }