From 6c262fe44f7e2dfa621630c117f5a78731fb0994 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 3 Oct 2017 02:49:06 +0200
Subject: [PATCH] Convert to C

---
 gfx/common/d3d_common.c                       |  8 ++++----
 gfx/drivers_renderchain/d3d9_cg_renderchain.c | 15 +++++++--------
 griffin/griffin.c                             |  9 +++++++++
 griffin/griffin_cpp.cpp                       |  4 ----
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/gfx/common/d3d_common.c b/gfx/common/d3d_common.c
index 10a38c28f6..baaf33cb3e 100644
--- a/gfx/common/d3d_common.c
+++ b/gfx/common/d3d_common.c
@@ -68,13 +68,13 @@ bool d3d_texture_get_surface_level(LPDIRECT3DTEXTURE tex,
    if (!tex)
       return false;
 #if defined(HAVE_D3D9) && !defined(__cplusplus)
-   if (SUCCEEDED(IDirect3DTexture9_GetSurfaceLevel(tex, idx, (LPDIRECT3DSURFACE**)_ppsurface_level)))
+   if (SUCCEEDED(IDirect3DTexture9_GetSurfaceLevel(tex, idx, (IDirect3DSurface9**)_ppsurface_level)))
       return true;
-#elif defined(HAVE_D3D9) && !defined(__cplusplus)
-   if (SUCCEEDED(IDirect3DTexture9_GetSurfaceLevel(tex, idx, (LPDIRECT3DSURFACE**)_ppsurface_level)))
+#elif defined(HAVE_D3D8) && !defined(__cplusplus)
+   if (SUCCEEDED(IDirect3DTexture8_GetSurfaceLevel(tex, idx, (LPDIRECT3DSURFACE**)_ppsurface_level)))
       return true;
 #else
-   if (SUCCEEDED(tex->GetSurfaceLevel(level, (LPDIRECT3DSURFACE**)_ppsurface_level)))
+   if (SUCCEEDED(tex->GetSurfaceLevel(idx, (LPDIRECT3DSURFACE**)_ppsurface_level)))
       return true;
 #endif
    return false;
diff --git a/gfx/drivers_renderchain/d3d9_cg_renderchain.c b/gfx/drivers_renderchain/d3d9_cg_renderchain.c
index 31d555f602..b153c8f177 100644
--- a/gfx/drivers_renderchain/d3d9_cg_renderchain.c
+++ b/gfx/drivers_renderchain/d3d9_cg_renderchain.c
@@ -783,8 +783,7 @@ static bool d3d9_cg_renderchain_init_shader(void *data,
       return false;
    }
 
-   HRESULT ret = cgD3D9SetDevice((IDirect3DDevice9*)d3d->dev);
-   if (FAILED(ret))
+   if (FAILED(cgD3D9SetDevice((IDirect3DDevice9*)d3d->dev)))
       return false;
    return true;
 }
@@ -1021,15 +1020,15 @@ static void d3d_recompute_pass_sizes(cg_renderchain_t *chain,
 {
    unsigned i;
    struct LinkInfo link_info         = {0};
-   link_info.pass                    = &d3d->shader.pass[0];
-   link_info.tex_w = link_info.tex_h =
-      d3d->video_info.input_scale * RARCH_SCALE_BASE;
-
-   unsigned current_width            = link_info.tex_w;
-   unsigned current_height           = link_info.tex_h;
+   unsigned current_width            = d3d->video_info.input_scale * RARCH_SCALE_BASE;
+   unsigned current_height           = d3d->video_info.input_scale * RARCH_SCALE_BASE;
    unsigned out_width                = 0;
    unsigned out_height               = 0;
 
+   link_info.pass                    = &d3d->shader.pass[0];
+   link_info.tex_w                   = current_width;
+   link_info.tex_h                   = current_height;
+
    if (!d3d9_cg_renderchain_set_pass_size(chain, 0,
             current_width, current_height))
    {
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 7f76bc0a12..51db20c744 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -317,6 +317,15 @@ VIDEO DRIVER
 #if defined(HAVE_D3D8)
 #include "../gfx/drivers_renderchain/d3d8_renderchain.c"
 #endif
+
+#if defined(HAVE_D3D9)
+
+#ifdef HAVE_CG
+#include "../gfx/drivers_renderchain/d3d9_cg_renderchain.c"
+#endif
+
+#endif
+
 #endif
 
 #if defined(GEKKO)
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 8aa44dce0c..bcc23bb222 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -137,10 +137,6 @@ VIDEO DRIVER
 #include "../gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp"
 #endif
 
-#ifdef HAVE_CG
-#include "../gfx/drivers_renderchain/d3d9_cg_renderchain.cpp"
-#endif
-
 #endif
 
 #ifdef HAVE_VULKAN