From e59d5a26b22b9b42ae594ea5142db6f29d43ca51 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 5 Apr 2015 18:08:33 +0200 Subject: [PATCH] (XDK) Buildfix --- gfx/d3d/d3d.cpp | 30 +----------------------------- gfx/d3d/render_chain_xdk.h | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index 55aa33f6b6..ed45f3350c 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -106,40 +106,12 @@ static unsigned monitor_count; #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) static void d3d_deinit_shader(void *data) { - d3d_video_t *d3d = (d3d_video_t*)data; - (void)d3d; - (void)data; - renderchain_deinit_shader(); } static bool d3d_init_shader(void *data) { - const char *shader_path = NULL; -#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) - const shader_backend_t *backend = NULL; -#endif - d3d_video_t *d3d = (d3d_video_t*)data; - settings_t *settings = config_get_ptr(); - - (void)d3d; - (void)data; - -#if defined(HAVE_HLSL) - RARCH_LOG("D3D]: Using HLSL shader backend.\n"); - backend = &hlsl_backend; - shader_path = settings->video.shader_path; - d3d->shader = backend; - - if (!d3d->shader) - return false; - - return d3d->shader->init(d3d, shader_path); -#elif defined(HAVE_CG) - return renderchain_init_shader(d3d); -#else - return false; -#endif + return renderchain_init_shader(data); } #endif diff --git a/gfx/d3d/render_chain_xdk.h b/gfx/d3d/render_chain_xdk.h index 23e2f10c58..7e4bb7b652 100644 --- a/gfx/d3d/render_chain_xdk.h +++ b/gfx/d3d/render_chain_xdk.h @@ -101,6 +101,33 @@ static bool renderchain_create_first_pass(void *data, return true; } +static void renderchain_deinit_shader(void) +{ +} + +static bool renderchain_init_shader(void *data) +{ + const char *shader_path = NULL; + d3d_video_t *d3d = (d3d_video_t*)data; + settings_t *settings = config_get_ptr(); + + if (!d3d) + return false; + +#if defined(HAVE_HLSL) + RARCH_LOG("D3D]: Using HLSL shader backend.\n"); + shader_path = settings->video.shader_path; + d3d->shader = &hlsl_backend; + + if (!d3d->shader) + return false; + + return d3d->shader->init(d3d, shader_path); +#endif + + return false; +} + static bool renderchain_init(void *data, const video_info_t *info) { d3d_video_t *chain = (d3d_video_t*)data;