From 02c514a8737b7f8e991550a9ac80c0b06e1d0a20 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 4 Apr 2015 03:04:01 +0200 Subject: [PATCH] (D3D) Build fixes --- gfx/d3d/d3d.cpp | 13 ++++++++++--- gfx/d3d/d3d.h | 1 + gfx/d3d/render_chain.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index e4246127a3..6a1f8a9a44 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -103,6 +103,7 @@ static HMONITOR monitor_all[MAX_MONITORS]; static unsigned monitor_count; #endif +#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; @@ -153,10 +154,11 @@ static bool d3d_init_shader(void *data) if (FAILED(ret)) return false; return true; -#elif defined(_XBOX1) - return false; +#else + return false; #endif } +#endif static void d3d_deinit_chain(d3d_video_t *d3d) { @@ -1013,7 +1015,12 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info) return false; if (!renderchain_init(d3d->chain, &d3d->video_info, d3dr, - d3d->cgCtx, &d3d->final_viewport, &link_info, +#ifdef HAVE_CG + d3d->cgCtx, +#else + NULL, +#endif + &d3d->final_viewport, &link_info, d3d->video_info.rgb32 ? ARGB : RGB565)) { RARCH_ERR("[D3D9]: Failed to init render chain.\n"); diff --git a/gfx/d3d/d3d.h b/gfx/d3d/d3d.h index 0dda1c0634..94c1ec9b86 100644 --- a/gfx/d3d/d3d.h +++ b/gfx/d3d/d3d.h @@ -50,6 +50,7 @@ #endif #include "../font_driver.h" +#include "../font_renderer_driver.h" #include "../video_context_driver.h" #ifdef HAVE_CG diff --git a/gfx/d3d/render_chain.h b/gfx/d3d/render_chain.h index aed7bc56f3..2893e6a295 100644 --- a/gfx/d3d/render_chain.h +++ b/gfx/d3d/render_chain.h @@ -20,6 +20,7 @@ #include "d3d.h" #include "../video_state_tracker.h" #include "../video_shader_parse.h" +#include "../inc/Cg/cg.h" struct Vertex {