From 8aef6dff1c857427a4538999093079936e483cd9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 2 Oct 2017 21:39:35 +0200 Subject: [PATCH] Convert d3d8_renderchain to C --- .../{d3d8_renderchain.cpp => d3d8_renderchain.c} | 0 griffin/griffin.c | 4 ++++ griffin/griffin_cpp.cpp | 8 +------- 3 files changed, 5 insertions(+), 7 deletions(-) rename gfx/drivers_renderchain/{d3d8_renderchain.cpp => d3d8_renderchain.c} (100%) diff --git a/gfx/drivers_renderchain/d3d8_renderchain.cpp b/gfx/drivers_renderchain/d3d8_renderchain.c similarity index 100% rename from gfx/drivers_renderchain/d3d8_renderchain.cpp rename to gfx/drivers_renderchain/d3d8_renderchain.c diff --git a/griffin/griffin.c b/griffin/griffin.c index 01fe421780..02a466773b 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -313,6 +313,10 @@ VIDEO DRIVER #include "../gfx/common/d3d_common.c" #include "../gfx/drivers/d3d.c" #include "../gfx/drivers_context/d3d_ctx.c" + +#if defined(HAVE_D3D8) +#include "../gfx/drivers_renderchain/d3d8_renderchain.c" +#endif #endif #if defined(GEKKO) diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp index 1ab47dcf79..9e8530344c 100644 --- a/griffin/griffin_cpp.cpp +++ b/griffin/griffin_cpp.cpp @@ -131,11 +131,7 @@ VIDEO DRIVER #include "../frontend/drivers/platform_xdk.cpp" #endif -#if defined(HAVE_D3D) - -#if defined(HAVE_D3D8) -#include "../gfx/drivers_renderchain/d3d8_renderchain.cpp" -#elif defined(HAVE_D3D9) +#if defined(HAVE_D3D) && defined(HAVE_D3D9) #ifdef HAVE_HLSL #include "../gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp" @@ -147,8 +143,6 @@ VIDEO DRIVER #endif -#endif - #ifdef HAVE_VULKAN #include "../gfx/drivers_shader/shader_vulkan.cpp" #include "../gfx/drivers_shader/glslang_util.cpp"