From b093cd4df05da07279be31da80c0a48078112490 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 11 Nov 2015 02:42:15 +0100
Subject: [PATCH] Reduce XBOX ifdefs

---
 gfx/d3d/d3d.cpp               | 11 +----------
 gfx/d3d/render_chain_cg.cpp   | 14 ++++++++++----
 gfx/d3d/render_chain_driver.h |  2 +-
 gfx/d3d/render_chain_xdk.cpp  |  4 ++--
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 693c590ff8..1d83cf79a4 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -1032,15 +1032,10 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info)
 
    if (
          !d3d->renderchain_driver->init(
-#ifdef _XBOX
             d3d,
-#else
-            d3d->renderchain_data,
-#endif
             &d3d->video_info,
             d3dr, &d3d->final_viewport, &link_info,
-            d3d->video_info.rgb32 ?
-            RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565)
+            d3d->video_info.rgb32)
       )
    {
       RARCH_ERR("[D3D]: Failed to init render chain.\n");
@@ -1630,11 +1625,7 @@ static bool d3d_frame(void *data, const void *frame,
 
    if (
          !d3d->renderchain_driver->render(
-#ifdef _XBOX
             d3d,
-#else
-            d3d->renderchain_data,
-#endif
             frame, frame_width, frame_height,
             pitch, d3d->dev_rotation))
    {
diff --git a/gfx/d3d/render_chain_cg.cpp b/gfx/d3d/render_chain_cg.cpp
index 51f8e0fcfd..312d7f6675 100644
--- a/gfx/d3d/render_chain_cg.cpp
+++ b/gfx/d3d/render_chain_cg.cpp
@@ -924,11 +924,13 @@ static bool cg_d3d9_renderchain_init(void *data,
       const void *_video_info,
       void *dev_,
       const void *final_viewport_,
-      const void *info_data, unsigned fmt)
+      const void *info_data, bool rgb32)
 {
    const LinkInfo *info           = (const LinkInfo*)info_data;
-   cg_renderchain_t *chain        = (cg_renderchain_t*)data;
+   d3d_video_t *d3d               = (d3d_video_t*)data;
+   cg_renderchain_t *chain        = (cg_renderchain_t*)d3d->renderchain_data;
    const video_info_t *video_info = (const video_info_t*)_video_info;
+   unsigned fmt                   = (rgb32) ? RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565;
 
    if (!chain)
       return false;
@@ -1398,10 +1400,14 @@ static bool cg_d3d9_renderchain_render(
       unsigned pitch, unsigned rotation)
 {
    Pass *last_pass;
+   LPDIRECT3DDEVICE d3dr;
    LPDIRECT3DSURFACE back_buffer, target;
    unsigned i, current_width, current_height, out_width = 0, out_height = 0;
-   cg_renderchain_t *chain = (cg_renderchain_t*)data;
-   LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev;
+   d3d_video_t *d3d        = (d3d_video_t*)data;
+   cg_renderchain_t *chain = d3d ? (cg_renderchain_t*)d3d->renderchain_data : NULL;
+
+   if (chain)
+      d3dr   = (LPDIRECT3DDEVICE)chain->dev;
 
    renderchain_start_render(chain);
 
diff --git a/gfx/d3d/render_chain_driver.h b/gfx/d3d/render_chain_driver.h
index 6043d17abd..b8c609e349 100644
--- a/gfx/d3d/render_chain_driver.h
+++ b/gfx/d3d/render_chain_driver.h
@@ -53,7 +53,7 @@ typedef struct renderchain_driver
          void *dev_data,
          const void *final_viewport_data,
          const void *info_data,
-         unsigned fmt);
+         bool rgb32);
    void (*set_final_viewport)(void *data,
          void *renderchain_data, const void *viewport_data);
    bool (*add_pass)(void *data, const void *info_data);
diff --git a/gfx/d3d/render_chain_xdk.cpp b/gfx/d3d/render_chain_xdk.cpp
index 772bd57f81..a51526ad13 100644
--- a/gfx/d3d/render_chain_xdk.cpp
+++ b/gfx/d3d/render_chain_xdk.cpp
@@ -318,7 +318,7 @@ static bool xdk_renderchain_init(void *data,
       void *dev_data,
       const void *final_viewport_data,
       const void *info_data,
-      unsigned fmt
+      bool rgb32
       )
 {
    unsigned width, height;
@@ -328,8 +328,8 @@ static bool xdk_renderchain_init(void *data,
    const video_info_t *video_info  = (const video_info_t*)_video_info;
    const LinkInfo *link_info    = (const LinkInfo*)info_data;
    xdk_renderchain_t *chain     = (xdk_renderchain_t*)d3d->renderchain_data;
+   unsigned fmt                 = (rgb32) ? RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565;
    (void)final_viewport_data;
-   (void)fmt;
 
    video_driver_get_size(&width, &height);