From f5d9427d48952e73a78fb2120f02c4459bf6c34b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 6 Nov 2017 19:44:00 +0100 Subject: [PATCH] Convert shader_hlsl.cpp to C --- gfx/drivers_shader/{shader_hlsl.cpp => shader_hlsl.c} | 0 griffin/griffin.c | 7 +++++++ griffin/griffin_cpp.cpp | 11 ----------- 3 files changed, 7 insertions(+), 11 deletions(-) rename gfx/drivers_shader/{shader_hlsl.cpp => shader_hlsl.c} (100%) diff --git a/gfx/drivers_shader/shader_hlsl.cpp b/gfx/drivers_shader/shader_hlsl.c similarity index 100% rename from gfx/drivers_shader/shader_hlsl.cpp rename to gfx/drivers_shader/shader_hlsl.c diff --git a/griffin/griffin.c b/griffin/griffin.c index 1a64bde2f4..6df60ea8e1 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -279,6 +279,13 @@ VIDEO SHADERS #include "../gfx/drivers_shader/shader_glsl.c" #endif +#if defined(HAVE_D3D) + +#ifdef HAVE_HLSL +#include "../gfx/drivers_shader/shader_hlsl.c" +#endif +#endif + /*============================================================ VIDEO IMAGE ============================================================ */ diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp index 5827eb94bd..fea06d3cab 100644 --- a/griffin/griffin_cpp.cpp +++ b/griffin/griffin_cpp.cpp @@ -97,17 +97,6 @@ MENU #include "../menu/drivers/xui.cpp" #endif -/*============================================================ -VIDEO CONTEXT -============================================================ */ - -#if defined(HAVE_D3D) - -#ifdef HAVE_HLSL -#include "../gfx/drivers_shader/shader_hlsl.cpp" -#endif -#endif - /*============================================================ UI ============================================================ */