From d4850b3cd4081497c809b0ca2882fee1c78baca7 Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Tue, 31 Dec 2013 23:19:51 +0100
Subject: [PATCH] (D3D) Split up D3DVideo-specific code to separate file

---
 gfx/d3d9/d3d9.cpp                             | 1324 +----------------
 gfx/d3d9/d3d9.hpp                             |   35 +-
 gfx/d3d9/d3d9_pc.cpp                          | 1303 ++++++++++++++++
 gfx/d3d9/render_chain.cpp                     |    4 +-
 gfx/d3d9/render_chain.hpp                     |    2 +-
 msvc/msvc-2010/RetroArch-msvc2010.vcxproj     |    3 +-
 .../RetroArch-msvc2010.vcxproj.filters        |    3 +
 7 files changed, 1346 insertions(+), 1328 deletions(-)
 create mode 100644 gfx/d3d9/d3d9_pc.cpp

diff --git a/gfx/d3d9/d3d9.cpp b/gfx/d3d9/d3d9.cpp
index 8e0a585b4d..9453ce817d 100644
--- a/gfx/d3d9/d3d9.cpp
+++ b/gfx/d3d9/d3d9.cpp
@@ -15,26 +15,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// This driver is merged from the external RetroArch-D3D9 driver.
-// It is written in C++11 (should be compat with MSVC 2010).
-// Might get rewritten in C99 if I have lots of time to burn.
-
-#ifdef _MSC_VER
-#ifndef _XBOX
-#pragma comment( lib, "d3d9" )
-#pragma comment( lib, "d3dx9" )
-#pragma comment( lib, "cgd3d9" )
-#pragma comment( lib, "dxguid" )
-#endif
-#endif
-
 #include "d3d9.hpp"
-#include "render_chain.hpp"
-#include "../../file.h"
+
 #include "../gfx_common.h"
 #include "../../compat/posix_string.h"
 #include "../../performance.h"
-#include "../context/win32_common.h"
 
 #include <iostream>
 #include <exception>
@@ -49,1301 +34,10 @@
 #undef min
 #undef max
 
-#define IDI_ICON 1
-#define MAX_MONITORS 9
-
-/* TODO: Make Cg optional - same as in the GL driver where we can either bake in
- * Cg or HLSL shader support */
-
-namespace Monitor
-{
-   static HMONITOR last_hm;
-   static HMONITOR all_hms[MAX_MONITORS];
-   static unsigned num_mons;
-   static unsigned cur_mon_id;
-}
-
 #ifdef __cplusplus
 extern "C"
 #endif
 
-#ifndef _XBOX
-bool dinput_handle_message(void *dinput, UINT message, WPARAM wParam, LPARAM lParam);
-
-namespace Callback
-{
-   static bool quit = false;
-   static D3DVideo *curD3D = NULL;
-   static HRESULT d3d_err;
-   static void *dinput;
-
-   LRESULT CALLBACK WindowProc(HWND hWnd, UINT message,
-         WPARAM wParam, LPARAM lParam)
-   {
-      switch (message)
-      {
-         case WM_CREATE:
-            LPCREATESTRUCT p_cs;
-            p_cs = (LPCREATESTRUCT)lParam;
-            curD3D = (D3DVideo*)p_cs->lpCreateParams;
-            break;
-
-         case WM_CHAR:
-         case WM_KEYDOWN:
-         case WM_KEYUP:
-         case WM_SYSKEYUP:
-         case WM_SYSKEYDOWN:
-            return win32_handle_keyboard_event(hWnd, message, wParam, lParam);
-
-         case WM_DESTROY:
-            quit = true;
-            return 0;
-
-         case WM_SIZE:
-            unsigned new_width, new_height;
-            new_width = LOWORD(lParam);
-            new_height = HIWORD(lParam);
-
-            if (new_width && new_height)
-               curD3D->resize(new_width, new_height);
-            return 0;
-      }
-      if (dinput_handle_message(dinput, message, wParam, lParam))
-         return 0;
-      return DefWindowProc(hWnd, message, wParam, lParam);
-   }
-}
-#endif
-
-void D3DVideo::init_base(const video_info_t &info)
-{
-   D3DPRESENT_PARAMETERS d3dpp;
-   make_d3dpp(info, d3dpp);
-
-   g_pD3D = Direct3DCreate9(D3D_SDK_VERSION);
-   if (!g_pD3D)
-      throw std::runtime_error("Failed to create D3D9 interface!");
-
-   if (FAILED(Callback::d3d_err = g_pD3D->CreateDevice(
-               Monitor::cur_mon_id,
-               D3DDEVTYPE_HAL,
-               hWnd,
-               D3DCREATE_HARDWARE_VERTEXPROCESSING,
-               &d3dpp,
-               &dev)))
-   {
-      RARCH_WARN("[D3D9]: Failed to init device with hardware vertex processing (code: 0x%x). Trying to fall back to software vertex processing.\n",
-                 (unsigned)Callback::d3d_err);
-
-      if (FAILED(Callback::d3d_err = g_pD3D->CreateDevice(
-                  Monitor::cur_mon_id,
-                  D3DDEVTYPE_HAL,
-                  hWnd,
-                  D3DCREATE_SOFTWARE_VERTEXPROCESSING,
-                  &d3dpp,
-                  &dev)))
-      {
-         throw std::runtime_error("Failed to init device");
-      }
-   }
-}
-
-void D3DVideo::make_d3dpp(const video_info_t &info, D3DPRESENT_PARAMETERS &d3dpp)
-{
-   memset(&d3dpp, 0, sizeof(d3dpp));
-
-   d3dpp.Windowed = g_settings.video.windowed_fullscreen || !info.fullscreen;
-
-   if (info.vsync)
-   {
-      switch (g_settings.video.swap_interval)
-      {
-         default:
-         case 1: d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE; break;
-         case 2: d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_TWO; break;
-         case 3: d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_THREE; break;
-         case 4: d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_FOUR; break;
-      }
-   }
-   else
-      d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
-
-   d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
-   d3dpp.hDeviceWindow = hWnd;
-   d3dpp.BackBufferCount = 2;
-   d3dpp.BackBufferFormat = !d3dpp.Windowed ? D3DFMT_X8R8G8B8 : D3DFMT_UNKNOWN;
-
-   if (!d3dpp.Windowed)
-   {
-      d3dpp.BackBufferWidth = screen_width;
-      d3dpp.BackBufferHeight = screen_height;
-   }
-}
-
-void D3DVideo::init(const video_info_t &info)
-{
-   if (!g_pD3D)
-      init_base(info);
-   else if (needs_restore)
-   {
-      D3DPRESENT_PARAMETERS d3dpp;
-      make_d3dpp(info, d3dpp);
-      if (dev->Reset(&d3dpp) != D3D_OK)
-      {
-         HRESULT res = dev->TestCooperativeLevel();
-         const char *err;
-         switch (res)
-         {
-            case D3DERR_DEVICELOST:
-               err = "DEVICELOST";
-               break;
-
-            case D3DERR_DEVICENOTRESET:
-               err = "DEVICENOTRESET";
-               break;
-
-            case D3DERR_DRIVERINTERNALERROR:
-               err = "DRIVERINTERNALERROR";
-               break;
-
-            default:
-               err = "Unknown";
-         }
-         // Try to recreate the device completely ...
-         RARCH_WARN("[D3D9]: Attempting to recover from dead state (%s).\n", err);
-         deinit(); 
-         g_pD3D->Release();
-         g_pD3D = NULL;
-         init_base(info);
-         RARCH_LOG("[D3D9]: Recovered from dead state.\n");
-      }
-   }
-
-   calculate_rect(screen_width, screen_height, info.force_aspect, g_extern.system.aspect_ratio);
-
-#ifdef HAVE_CG
-   if (!init_cg())
-      throw std::runtime_error("Failed to init Cg");
-#endif
-   if (!init_chain(info))
-      throw std::runtime_error("Failed to init render chain");
-   if (!init_font())
-      throw std::runtime_error("Failed to init Font");
-}
-
-void D3DVideo::set_viewport(int x, int y, unsigned width, unsigned height)
-{
-   D3DVIEWPORT9 viewport;
-   viewport.X = std::max(x, 0); // D3D9 doesn't support negative X/Y viewports ...
-   viewport.Y = std::max(y, 0);
-   viewport.Width = width;
-   viewport.Height = height;
-   viewport.MinZ = 0.0f;
-   viewport.MaxZ = 1.0f;
-
-   final_viewport = viewport;
-
-   set_font_rect(NULL);
-}
-
-void D3DVideo::set_font_rect(font_params_t *params)
-{
-   float pos_x = g_settings.video.msg_pos_x;
-   float pos_y = g_settings.video.msg_pos_y;
-   float font_size = g_settings.video.font_size;
-
-   if (params)
-   {
-      pos_x = params->x;
-      pos_y = params->y;
-      font_size *= params->scale;
-   }
-
-   font_rect.left = final_viewport.X + final_viewport.Width * pos_x;
-   font_rect.right = final_viewport.X + final_viewport.Width;
-   font_rect.top = final_viewport.Y + (1.0f - pos_y) * final_viewport.Height - font_size; 
-   font_rect.bottom = final_viewport.Height;
-
-   font_rect_shifted = font_rect;
-   font_rect_shifted.left -= 2;
-   font_rect_shifted.right -= 2;
-   font_rect_shifted.top += 2;
-   font_rect_shifted.bottom += 2;
-}
-
-void D3DVideo::set_rotation(unsigned rot)
-{
-   rotation = rot;
-}
-
-void D3DVideo::viewport_info(rarch_viewport &vp)
-{
-   vp.x      = final_viewport.X;
-   vp.y      = final_viewport.Y;
-   vp.width  = final_viewport.Width;
-   vp.height = final_viewport.Height;
-
-   vp.full_width  = screen_width;
-   vp.full_height = screen_height;
-}
-
-bool D3DVideo::read_viewport(uint8_t *buffer)
-{
-   RARCH_PERFORMANCE_INIT(d3d_read_viewport);
-   RARCH_PERFORMANCE_START(d3d_read_viewport);
-   bool ret = true;
-   IDirect3DSurface9 *target = NULL;
-   IDirect3DSurface9 *dest   = NULL;
-
-   if (FAILED(Callback::d3d_err = dev->GetRenderTarget(0, &target)))
-   {
-      ret = false;
-      goto end;
-   }
-
-   if (FAILED(Callback::d3d_err = dev->CreateOffscreenPlainSurface(screen_width, screen_height,
-        D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM,
-        &dest, NULL)))
-   {
-      ret = false;
-      goto end;
-   }
-
-   if (FAILED(Callback::d3d_err = dev->GetRenderTargetData(target, dest)))
-   {
-      ret = false;
-      goto end;
-   }
-
-   D3DLOCKED_RECT rect;
-   if (SUCCEEDED(dest->LockRect(&rect, NULL, D3DLOCK_READONLY)))
-   {
-      unsigned pitchpix = rect.Pitch / 4;
-      const uint32_t *pixels = (const uint32_t*)rect.pBits;
-      pixels += final_viewport.X;
-      pixels += (final_viewport.Height - 1) * pitchpix;
-      pixels -= final_viewport.Y * pitchpix;
-
-      for (unsigned y = 0; y < final_viewport.Height; y++, pixels -= pitchpix)
-      {
-         for (unsigned x = 0; x < final_viewport.Width; x++)
-         {
-            *buffer++ = (pixels[x] >>  0) & 0xff;
-            *buffer++ = (pixels[x] >>  8) & 0xff;
-            *buffer++ = (pixels[x] >> 16) & 0xff;
-         }
-      }
-
-      dest->UnlockRect();
-   }
-   else
-   {
-      ret = false;
-      goto end;
-   }
-
-end:
-   RARCH_PERFORMANCE_STOP(d3d_read_viewport);
-   if (target)
-      target->Release();
-   if (dest)
-      dest->Release();
-   return ret;
-}
-
-void D3DVideo::calculate_rect(unsigned width, unsigned height,
-   bool keep, float desired_aspect)
-{
-   if (g_settings.video.scale_integer)
-   {
-      struct rarch_viewport vp = {0};
-      gfx_scale_integer(&vp, width, height, desired_aspect, keep);
-      set_viewport(vp.x, vp.y, vp.width, vp.height);
-   }
-   else if (!keep)
-      set_viewport(0, 0, width, height);
-   else
-   {
-      if (g_settings.video.aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-      {
-         const rarch_viewport_t &custom = g_extern.console.screen.viewports.custom_vp;
-         set_viewport(custom.x, custom.y, custom.width, custom.height);
-      }
-      else
-      {
-         float device_aspect = static_cast<float>(width) / static_cast<float>(height);
-         if (fabsf(device_aspect - desired_aspect) < 0.0001f)
-            set_viewport(0, 0, width, height);
-         else if (device_aspect > desired_aspect)
-         {
-            float delta = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f;
-            set_viewport(int(roundf(width * (0.5f - delta))), 0, unsigned(roundf(2.0f * width * delta)), height);
-         }
-         else
-         {
-            float delta = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f;
-            set_viewport(0, int(roundf(height * (0.5f - delta))), width, unsigned(roundf(2.0f * height * delta)));
-         }
-      }
-   }
-}
-
-#ifndef _XBOX
-static void show_cursor(bool show)
-{
-   if (show)
-      while (ShowCursor(TRUE) < 0);
-   else
-      while (ShowCursor(FALSE) >= 0);
-}
-#endif
-
-static BOOL CALLBACK monitor_enum_proc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData)
-{
-   Monitor::all_hms[Monitor::num_mons++] = hMonitor;
-   return TRUE;
-}
-
-// Multi-monitor support.
-RECT D3DVideo::monitor_rect()
-{
-   Monitor::num_mons = 0;
-   EnumDisplayMonitors(NULL, NULL, monitor_enum_proc, 0);
-
-   if (!Monitor::last_hm)
-      Monitor::last_hm = MonitorFromWindow(GetDesktopWindow(), MONITOR_DEFAULTTONEAREST);
-   HMONITOR hm_to_use = Monitor::last_hm;
-
-   unsigned fs_monitor = g_settings.video.monitor_index;
-   if (fs_monitor && fs_monitor <= Monitor::num_mons && Monitor::all_hms[fs_monitor - 1])
-   {
-      hm_to_use = Monitor::all_hms[fs_monitor - 1];
-      Monitor::cur_mon_id = fs_monitor - 1;
-   }
-   else
-   {
-      for (unsigned i = 0; i < Monitor::num_mons; i++)
-      {
-         if (Monitor::all_hms[i] == hm_to_use)
-         {
-            Monitor::cur_mon_id = i;
-            break;
-         }
-      }
-   }
-
-   MONITORINFOEX current_mon;
-   memset(&current_mon, 0, sizeof(current_mon));
-   current_mon.cbSize = sizeof(MONITORINFOEX);
-   GetMonitorInfo(hm_to_use, (MONITORINFO*)&current_mon);
-
-   return current_mon.rcMonitor;
-}
-
-D3DVideo::D3DVideo(const video_info_t *info) :
-   g_pD3D(NULL), dev(NULL), font(NULL),
-   rotation(0), needs_restore(false), cgCtx(NULL), overlays_enabled(false)
-{
-   should_resize = false;
-   gfx_set_dwm();
-
-#ifdef HAVE_MENU
-   memset(&rgui, 0, sizeof(rgui));
-   rgui.tex_coords.x = 0;
-   rgui.tex_coords.y = 0;
-   rgui.tex_coords.w = 1;
-   rgui.tex_coords.h = 1;
-   rgui.vert_coords.x = 0;
-   rgui.vert_coords.y = 1;
-   rgui.vert_coords.w = 1;
-   rgui.vert_coords.h = -1;
-#endif
-
-   memset(&windowClass, 0, sizeof(windowClass));
-   windowClass.cbSize        = sizeof(windowClass);
-   windowClass.style         = CS_HREDRAW | CS_VREDRAW;
-   windowClass.lpfnWndProc   = Callback::WindowProc;
-   windowClass.hInstance     = NULL;
-   windowClass.hCursor       = LoadCursor(NULL, IDC_ARROW);
-   windowClass.lpszClassName = "RetroArch";
-   windowClass.hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICON));
-   windowClass.hIconSm = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0);
-   if (!info->fullscreen)
-      windowClass.hbrBackground = (HBRUSH)COLOR_WINDOW;
-
-   RegisterClassEx(&windowClass);
-   RECT mon_rect = monitor_rect();
-
-   bool windowed_full = g_settings.video.windowed_fullscreen;
-
-   unsigned full_x = (windowed_full || info->width  == 0) ? (mon_rect.right  - mon_rect.left) : info->width;
-   unsigned full_y = (windowed_full || info->height == 0) ? (mon_rect.bottom - mon_rect.top)  : info->height;
-   RARCH_LOG("[D3D9]: Monitor size: %dx%d.\n", (int)(mon_rect.right  - mon_rect.left), (int)(mon_rect.bottom - mon_rect.top));
-
-   screen_width  = info->fullscreen ? full_x : info->width;
-   screen_height = info->fullscreen ? full_y : info->height;
-
-   unsigned win_width  = screen_width;
-   unsigned win_height = screen_height;
-
-   if (!info->fullscreen)
-   {
-      RECT rect   = {0};
-      rect.right  = screen_width;
-      rect.bottom = screen_height;
-      AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE);
-      win_width  = rect.right - rect.left;
-      win_height = rect.bottom - rect.top;
-   }
-
-   char buffer[128];
-   gfx_get_fps(buffer, sizeof(buffer), NULL, 0);
-   std::string title = buffer;
-   title += " || Direct3D9";
-
-   hWnd = CreateWindowEx(0, "RetroArch", title.c_str(),
-         info->fullscreen ?
-         (WS_EX_TOPMOST | WS_POPUP) : WS_OVERLAPPEDWINDOW,
-         info->fullscreen ? mon_rect.left : CW_USEDEFAULT,
-         info->fullscreen ? mon_rect.top  : CW_USEDEFAULT,
-         win_width, win_height,
-         NULL, NULL, NULL, this);
-
-   driver.display_type  = RARCH_DISPLAY_WIN32;
-   driver.video_display = 0;
-   driver.video_window  = (uintptr_t)hWnd;
-
-   show_cursor(!info->fullscreen
-#ifdef HAVE_OVERLAY
-      || overlays_enabled
-#endif
-   );
-   Callback::quit = false;
-
-   ShowWindow(hWnd, SW_RESTORE);
-   UpdateWindow(hWnd);
-   SetForegroundWindow(hWnd);
-   SetFocus(hWnd);
-
-   // This should only be done once here
-   // to avoid set_shader() to be overridden
-   // later.
-#ifdef HAVE_CG
-   enum rarch_shader_type type = gfx_shader_parse_type(g_settings.video.shader_path, RARCH_SHADER_NONE);
-   if (g_settings.video.shader_enable && type == RARCH_SHADER_CG)
-      cg_shader = g_settings.video.shader_path;
-#endif
-
-   process_shader();
-
-   video_info = *info;
-   init(video_info);
-
-   RARCH_LOG("[D3D9]: Init complete.\n");
-}
-
-void D3DVideo::deinit()
-{
-   deinit_font();
-   deinit_chain();
-   deinit_cg();
-
-   needs_restore = false;
-}
-
-#ifdef HAVE_OVERLAY
-void D3DVideo::free_overlays()
-{
-   for (unsigned i = 0; i < overlays.size(); i++)
-      free_overlay(overlays[i]);
-   overlays.clear();
-}
-#endif
-
-void D3DVideo::free_overlay(overlay_t &overlay)
-{
-   if (overlay.tex)
-      overlay.tex->Release();
-   if (overlay.vert_buf)
-      overlay.vert_buf->Release();
-}
-
-D3DVideo::~D3DVideo()
-{
-   deinit();
-#ifdef HAVE_OVERLAY
-   free_overlays();
-#endif
-#ifdef HAVE_MENU
-   free_overlay(rgui);
-#endif
-   if (dev)
-      dev->Release();
-   if (g_pD3D)
-      g_pD3D->Release();
-
-   Monitor::last_hm = MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
-   DestroyWindow(hWnd);
-
-   UnregisterClass("RetroArch", GetModuleHandle(NULL));
-}
-
-bool D3DVideo::restore()
-{
-   deinit();
-   try
-   {
-      needs_restore = true;
-      init(video_info);
-      needs_restore = false;
-   }
-   catch (const std::exception &e)
-   {
-      RARCH_ERR("[D3D9]: Restore error: (%s).\n", e.what());
-      needs_restore = true;
-   }
-
-   return !needs_restore;
-}
-
-bool D3DVideo::frame(const void *frame,
-      unsigned width, unsigned height, unsigned pitch,
-      const char *msg)
-{
-   if (!frame)
-      return true;
-
-   RARCH_PERFORMANCE_INIT(d3d_frame);
-   RARCH_PERFORMANCE_START(d3d_frame);
-   // We cannot recover in fullscreen.
-   if (needs_restore && IsIconic(hWnd))
-      return true;
-
-   if (needs_restore && !restore())
-   {
-      RARCH_ERR("[D3D9]: Failed to restore.\n");
-      return false;
-   }
-
-   if (should_resize)
-   {
-      calculate_rect(screen_width, screen_height, video_info.force_aspect, g_extern.system.aspect_ratio);
-      chain->set_final_viewport(final_viewport);
-      recompute_pass_sizes();
-
-      should_resize = false;
-   }
-
-   // render_chain() only clears out viewport, clear out everything.
-   D3DVIEWPORT9 screen_vp;
-   screen_vp.X = 0;
-   screen_vp.Y = 0;
-   screen_vp.MinZ = 0;
-   screen_vp.MaxZ = 1;
-   screen_vp.Width = screen_width;
-   screen_vp.Height = screen_height;
-   dev->SetViewport(&screen_vp);
-   dev->Clear(0, 0, D3DCLEAR_TARGET, 0, 1, 0);
-
-   // Insert black frame first, so we can screenshot, etc.
-   if (g_settings.video.black_frame_insertion)
-   {
-      if (dev->Present(NULL, NULL, NULL, NULL) != D3D_OK)
-      {
-         needs_restore = true;
-         return true;
-      }
-      dev->Clear(0, 0, D3DCLEAR_TARGET, 0, 1, 0);
-   }
-
-   if (!chain->render(frame, width, height, pitch, rotation))
-   {
-      RARCH_ERR("[D3D9]: Failed to render scene.\n");
-      return false;
-   }
-
-   render_msg(msg);
-
-#ifdef HAVE_MENU
-   if (rgui.enabled)
-      overlay_render(rgui);
-#endif
-
-#ifdef HAVE_OVERLAY
-   if (overlays_enabled)
-   {
-      for (unsigned i = 0; i < overlays.size(); i++)
-         overlay_render(overlays[i]);
-   }
-#endif
-
-   RARCH_PERFORMANCE_STOP(d3d_frame);
-
-   if (dev->Present(NULL, NULL, NULL, NULL) != D3D_OK)
-   {
-      needs_restore = true;
-      return true;
-   }
-
-   update_title();
-   return true;
-}
-
-void D3DVideo::render_msg(const char *msg, font_params_t *params)
-{
-   if (params)
-      set_font_rect(params);
-
-   if (msg && SUCCEEDED(dev->BeginScene()))
-   {
-      font->DrawTextA(NULL,
-            msg,
-            -1,
-            &font_rect_shifted,
-            DT_LEFT,
-            ((font_color >> 2) & 0x3f3f3f) | 0xff000000);
-
-      font->DrawTextA(NULL,
-            msg,
-            -1,
-            &font_rect,
-            DT_LEFT,
-            font_color | 0xff000000);
-
-      dev->EndScene();
-   }
-
-   if (params)
-      set_font_rect(NULL);
-}
-
-void D3DVideo::set_nonblock_state(bool state)
-{
-   video_info.vsync = !state;
-   restore();
-}
-
-bool D3DVideo::alive()
-{
-   process();
-   return !Callback::quit;
-}
-
-bool D3DVideo::focus() const
-{
-   return GetFocus() == hWnd;
-}
-
-void D3DVideo::process()
-{
-#ifndef _XBOX
-   MSG msg;
-   while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
-   {
-      TranslateMessage(&msg);
-      DispatchMessage(&msg);
-   }
-#endif
-}
-
-#ifdef HAVE_CG
-bool D3DVideo::init_cg()
-{
-   cgCtx = cgCreateContext();
-   if (cgCtx == NULL)
-      return false;
-
-   RARCH_LOG("[D3D9 Cg]: Created context.\n");
-
-   HRESULT ret = cgD3D9SetDevice(dev);
-   if (FAILED(ret))
-      return false;
-
-   return true;
-}
-
-void D3DVideo::deinit_cg()
-{
-   if (cgCtx)
-   {
-      cgD3D9UnloadAllPrograms();
-      cgD3D9SetDevice(NULL);
-      cgDestroyContext(cgCtx);
-      cgCtx = NULL;
-   }
-}
-#endif
-
-void D3DVideo::init_singlepass()
-{
-   memset(&shader, 0, sizeof(shader));
-   shader.passes = 1;
-   gfx_shader_pass &pass = shader.pass[0];
-   pass.fbo.valid = true;
-   pass.fbo.scale_x = pass.fbo.scale_y = 1.0;
-   pass.fbo.type_x = pass.fbo.type_y = RARCH_SCALE_VIEWPORT;
-   strlcpy(pass.source.cg, cg_shader.c_str(), sizeof(pass.source.cg));
-}
-
-void D3DVideo::init_imports()
-{
-   if (!shader.variables)
-      return;
-
-   state_tracker_info tracker_info = {0};
-
-   tracker_info.wram = (uint8_t*)pretro_get_memory_data(RETRO_MEMORY_SYSTEM_RAM);
-   tracker_info.info = shader.variable;
-   tracker_info.info_elem = shader.variables;
-
-#ifdef HAVE_PYTHON
-   if (*shader.script_path)
-   {
-      tracker_info.script = shader.script_path;
-      tracker_info.script_is_file = true;
-   }
-
-   tracker_info.script_class = *shader.script_class ? shader.script_class : NULL;
-#endif
-
-   state_tracker_t *state_tracker = state_tracker_init(&tracker_info);
-   if (!state_tracker)
-      throw std::runtime_error("Failed to initialize state tracker.");
-
-   std::shared_ptr<state_tracker_t> tracker(state_tracker, [](state_tracker_t *tracker) {
-            state_tracker_free(tracker);
-         });
-
-   chain->add_state_tracker(tracker);
-}
-
-void D3DVideo::init_luts()
-{
-   for (unsigned i = 0; i < shader.luts; i++)
-   {
-      chain->add_lut(shader.lut[i].id, shader.lut[i].path,
-         shader.lut[i].filter == RARCH_FILTER_UNSPEC ?
-            g_settings.video.smooth :
-            (shader.lut[i].filter == RARCH_FILTER_LINEAR));
-   }
-}
-
-void D3DVideo::init_multipass()
-{
-   config_file_t *conf = config_file_new(cg_shader.c_str());
-   if (!conf)
-      throw std::runtime_error("Failed to load preset");
-
-   memset(&shader, 0, sizeof(shader));
-
-   if (!gfx_shader_read_conf_cgp(conf, &shader))
-   {
-      config_file_free(conf);
-      throw std::runtime_error("Failed to parse CGP file.");
-   }
-
-   config_file_free(conf);
-
-   gfx_shader_resolve_relative(&shader, cg_shader.c_str());
-
-   RARCH_LOG("[D3D9 Meta-Cg] Found %d shaders.\n", shader.passes);
-
-   for (unsigned i = 0; i < shader.passes; i++)
-   {
-      if (!shader.pass[i].fbo.valid)
-      {
-         shader.pass[i].fbo.scale_x = shader.pass[i].fbo.scale_y = 1.0f;
-         shader.pass[i].fbo.type_x = shader.pass[i].fbo.type_y = RARCH_SCALE_INPUT;
-      }
-   }
-
-   bool use_extra_pass = shader.passes < GFX_MAX_SHADERS && shader.pass[shader.passes - 1].fbo.valid;
-   if (use_extra_pass)
-   {
-      shader.passes++;
-      gfx_shader_pass &dummy_pass = shader.pass[shader.passes - 1];
-      dummy_pass.fbo.scale_x = dummy_pass.fbo.scale_y = 1.0f;
-      dummy_pass.fbo.type_x = dummy_pass.fbo.type_y = RARCH_SCALE_VIEWPORT;
-      dummy_pass.filter = RARCH_FILTER_UNSPEC;
-   }
-   else
-   {
-      gfx_shader_pass &pass = shader.pass[shader.passes - 1];
-      pass.fbo.scale_x = pass.fbo.scale_y = 1.0f;
-      pass.fbo.type_x = pass.fbo.type_y = RARCH_SCALE_VIEWPORT;
-   }
-}
-
-bool D3DVideo::set_shader(const std::string &path)
-{
-   auto old_shader = cg_shader;
-   bool restore_old = false;
-   try
-   {
-      cg_shader = path;
-      process_shader();
-      restore();
-   }
-   catch (const std::exception &e)
-   {
-      RARCH_ERR("[D3D9]: Setting shader failed: (%s).\n", e.what());
-      restore_old = true;
-   }
-
-   if (restore_old)
-   {
-      cg_shader = old_shader;
-      process_shader();
-      restore();
-   }
-
-   return !restore_old;
-}
-
-void D3DVideo::process_shader()
-{
-   if (strcmp(path_get_extension(cg_shader.c_str()), "cgp") == 0)
-      init_multipass();
-   else
-      init_singlepass();
-}
-
-void D3DVideo::recompute_pass_sizes()
-{
-   try
-   {
-      LinkInfo link_info = {0};
-      link_info.pass = &shader.pass[0];
-      link_info.tex_w = link_info.tex_h = video_info.input_scale * RARCH_SCALE_BASE;
-
-      unsigned current_width = link_info.tex_w;
-      unsigned current_height = link_info.tex_h;
-      unsigned out_width = 0;
-      unsigned out_height = 0;
-
-      chain->set_pass_size(0, current_width, current_height);
-      for (unsigned i = 1; i < shader.passes; i++)
-      {
-         RenderChain::convert_geometry(link_info,
-               out_width, out_height,
-               current_width, current_height, final_viewport);
-
-         link_info.tex_w = next_pow2(out_width);
-         link_info.tex_h = next_pow2(out_height);
-
-         chain->set_pass_size(i, link_info.tex_w, link_info.tex_h);
-
-         current_width = out_width;
-         current_height = out_height;
-
-         link_info.pass = &shader.pass[i];
-      }
-   }
-   catch (const std::exception& e)
-   {
-      RARCH_ERR("[D3D9]: Render chain error: (%s).\n", e.what());
-   }
-}
-
-bool D3DVideo::init_chain(const video_info_t &video_info)
-{
-   try
-   {
-      // Setup information for first pass.
-      LinkInfo link_info = {0};
-
-      link_info.pass = &shader.pass[0];
-      link_info.tex_w = link_info.tex_h = video_info.input_scale * RARCH_SCALE_BASE;
-
-      chain = std::unique_ptr<RenderChain>(
-            new RenderChain(
-               video_info,
-               dev, cgCtx,
-               link_info,
-               video_info.rgb32 ? RenderChain::ARGB : RenderChain::RGB565,
-               final_viewport));
-
-      unsigned current_width = link_info.tex_w;
-      unsigned current_height = link_info.tex_h;
-      unsigned out_width = 0;
-      unsigned out_height = 0;
-
-      for (unsigned i = 1; i < shader.passes; i++)
-      {
-         RenderChain::convert_geometry(link_info,
-               out_width, out_height,
-               current_width, current_height, final_viewport);
-
-         link_info.pass = &shader.pass[i];
-         link_info.tex_w = next_pow2(out_width);
-         link_info.tex_h = next_pow2(out_height);
-
-         current_width = out_width;
-         current_height = out_height;
-
-         chain->add_pass(link_info);
-      }
-
-      init_luts();
-      init_imports();
-   }
-   catch (const std::exception &e)
-   {
-      RARCH_ERR("[D3D9]: Render chain error: (%s).\n", e.what());
-      return false;
-   }
-
-   return true;
-}
-
-void D3DVideo::deinit_chain()
-{
-   chain.reset();
-}
-
-bool D3DVideo::init_font()
-{
-   D3DXFONT_DESC desc = {
-      static_cast<int>(g_settings.video.font_size), 0, 400, 0,
-      false, DEFAULT_CHARSET,
-      OUT_TT_PRECIS,
-      CLIP_DEFAULT_PRECIS,
-      DEFAULT_PITCH,
-      "Verdana" // Hardcode ftl :(
-   };
-
-   uint32_t r = static_cast<uint32_t>(g_settings.video.msg_color_r * 255) & 0xff;
-   uint32_t g = static_cast<uint32_t>(g_settings.video.msg_color_g * 255) & 0xff;
-   uint32_t b = static_cast<uint32_t>(g_settings.video.msg_color_b * 255) & 0xff;
-   font_color = D3DCOLOR_XRGB(r, g, b);
-
-   return SUCCEEDED(D3DXCreateFontIndirect(dev, &desc, &font));
-}
-
-void D3DVideo::deinit_font()
-{
-   if (font)
-      font->Release();
-   font = NULL;
-}
-
-void D3DVideo::update_title()
-{
-   char buffer[128], buffer_fps[128];
-   bool fps_draw = g_settings.fps_show;
-   if (gfx_get_fps(buffer, sizeof(buffer), fps_draw ? buffer_fps : NULL, sizeof(buffer_fps)))
-   {
-      std::string title = buffer;
-      title += " || Direct3D9";
-      SetWindowText(hWnd, title.c_str());
-   }
-
-   if (fps_draw)
-      msg_queue_push(g_extern.msg_queue, buffer_fps, 1, 1);
-
-   g_extern.frame_count++;
-}
-
-void D3DVideo::resize(unsigned new_width, unsigned new_height)
-{
-   if (!dev)
-      return;
-
-   RARCH_LOG("[D3D9]: Resize %ux%u.\n", new_width, new_height);
-
-   if (new_width != video_info.width || new_height != video_info.height)
-   {
-      video_info.width = screen_width = new_width;
-      video_info.height = screen_height = new_height;
-      restore();
-   }
-}
-
-#ifdef HAVE_OVERLAY
-bool D3DVideo::overlay_load(const texture_image *images, unsigned num_images)
-{
-   free_overlays();
-   overlays.resize(num_images);
-
-   for (unsigned i = 0; i < num_images; i++)
-   {
-      unsigned width = images[i].width;
-      unsigned height = images[i].height;
-      overlay_t &overlay = overlays[i];
-      if (FAILED(dev->CreateTexture(width, height, 1,
-                  0,
-                  D3DFMT_A8R8G8B8,
-                  D3DPOOL_MANAGED,
-                  &overlay.tex, NULL)))
-      {
-         RARCH_ERR("[D3D9]: Failed to create overlay texture\n");
-         return false;
-      }
-
-      D3DLOCKED_RECT d3dlr;
-      if (SUCCEEDED(overlay.tex->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK)))
-      {
-         uint32_t *dst = static_cast<uint32_t*>(d3dlr.pBits);
-         const uint32_t *src = images[i].pixels;
-         unsigned pitch = d3dlr.Pitch >> 2;
-         for (unsigned y = 0; y < height; y++, dst += pitch, src += width)
-            memcpy(dst, src, width << 2);
-         overlay.tex->UnlockRect(0);
-      }
-
-      overlay.tex_w = width;
-      overlay.tex_h = height;
-      overlay_tex_geom(i, 0, 0, 1, 1); // Default. Stretch to whole screen.
-      overlay_vertex_geom(i, 0, 0, 1, 1);
-   }
-
-   return true;
-}
-
-void D3DVideo::overlay_tex_geom(unsigned index, float x, float y, float w, float h)
-{
-   overlays[index].tex_coords.x = x;
-   overlays[index].tex_coords.y = y;
-   overlays[index].tex_coords.w = w;
-   overlays[index].tex_coords.h = h;
-}
-
-void D3DVideo::overlay_vertex_geom(unsigned index, float x, float y, float w, float h)
-{
-   y = 1.0f - y;
-   h = -h;
-   overlays[index].vert_coords.x = x;
-   overlays[index].vert_coords.y = y;
-   overlays[index].vert_coords.w = w;
-   overlays[index].vert_coords.h = h;
-}
-
-void D3DVideo::overlay_enable(bool state)
-{
-   for (unsigned i = 0; i < overlays.size(); i++)
-      overlays_enabled = state;
-   show_cursor(state);
-}
-
-void D3DVideo::overlay_full_screen(bool enable)
-{
-   for (unsigned i = 0; i < overlays.size(); i++)
-      overlays[i].fullscreen = enable;
-}
-
-void D3DVideo::overlay_set_alpha(unsigned index, float mod)
-{
-   overlays[index].alpha_mod = mod;
-}
-#endif
-
-void D3DVideo::overlay_render(overlay_t &overlay)
-{  
-   if (!overlay.tex)
-      return;
-
-   struct overlay_vertex
-   {
-      float x, y, z;
-      float u, v;
-      float r, g, b, a;
-   } vert[4];
-
-   if (!overlay.vert_buf)
-   {
-      dev->CreateVertexBuffer(
-            sizeof(vert),
-            dev->GetSoftwareVertexProcessing() ? D3DUSAGE_SOFTWAREPROCESSING : 0,
-            0,
-            D3DPOOL_MANAGED,
-            &overlay.vert_buf,
-            NULL);
-   }
-
-   for (unsigned i = 0; i < 4; i++)
-   {
-      vert[i].z = 0.5f;
-      vert[i].r = vert[i].g = vert[i].b = 1.0f;
-      vert[i].a = overlay.alpha_mod;
-   }
-
-   float overlay_width = final_viewport.Width;
-   float overlay_height = final_viewport.Height;
-
-   vert[0].x = overlay.vert_coords.x * overlay_width;
-   vert[1].x = (overlay.vert_coords.x + overlay.vert_coords.w) * overlay_width;
-   vert[2].x = overlay.vert_coords.x * overlay_width;
-   vert[3].x = (overlay.vert_coords.x + overlay.vert_coords.w) * overlay_width;
-   vert[0].y = overlay.vert_coords.y * overlay_height;
-   vert[1].y = overlay.vert_coords.y * overlay_height;
-   vert[2].y = (overlay.vert_coords.y + overlay.vert_coords.h) * overlay_height;
-   vert[3].y = (overlay.vert_coords.y + overlay.vert_coords.h) * overlay_height;
-
-   vert[0].u = overlay.tex_coords.x;
-   vert[1].u = overlay.tex_coords.x + overlay.tex_coords.w;
-   vert[2].u = overlay.tex_coords.x;
-   vert[3].u = overlay.tex_coords.x + overlay.tex_coords.w;
-   vert[0].v = overlay.tex_coords.y;
-   vert[1].v = overlay.tex_coords.y;
-   vert[2].v = overlay.tex_coords.y + overlay.tex_coords.h;
-   vert[3].v = overlay.tex_coords.y + overlay.tex_coords.h;
-
-   // Align texels and vertices.
-   for (unsigned i = 0; i < 4; i++)
-   {
-      vert[i].x -= 0.5f;
-      vert[i].y += 0.5f;
-   }
-
-   void *verts;
-   overlay.vert_buf->Lock(0, sizeof(vert), &verts, 0);
-   memcpy(verts, vert, sizeof(vert));
-   overlay.vert_buf->Unlock();
-
-   // enable alpha
-   dev->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
-   dev->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
-   dev->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
-
-   // set vertex decl for overlay
-   D3DVERTEXELEMENT9 vElems[4] = {
-      {0, 0,  D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0},
-      {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0},
-      {0, 20, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0},
-      D3DDECL_END()
-   };
-   IDirect3DVertexDeclaration9 *vertex_decl;
-   dev->CreateVertexDeclaration(vElems, &vertex_decl);
-   dev->SetVertexDeclaration(vertex_decl);
-   vertex_decl->Release();
-
-   dev->SetStreamSource(0, overlay.vert_buf, 0, sizeof(overlay_vertex));
-
-   if (overlay.fullscreen)
-   {
-      // set viewport to full window
-      D3DVIEWPORT9 vp_full;
-      vp_full.X = 0;
-      vp_full.Y = 0;
-      vp_full.Width = screen_width;
-      vp_full.Height = screen_height;
-      vp_full.MinZ = 0.0f;
-      vp_full.MaxZ = 1.0f;
-      dev->SetViewport(&vp_full);
-   }
-
-   // render overlay
-   dev->SetTexture(0, overlay.tex);
-   dev->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
-   dev->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
-   dev->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
-   dev->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
-   if (SUCCEEDED(dev->BeginScene()))
-   {
-      dev->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
-      dev->EndScene();
-   }
-
-   // restore previous state
-   dev->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
-   dev->SetViewport(&final_viewport);
-}
-
-#ifdef HAVE_MENU
-void D3DVideo::set_rgui_texture_frame(const void *frame,
-      bool rgb32, unsigned width, unsigned height,
-      float alpha)
-{
-   if (!rgui.tex || rgui.tex_w != width || rgui.tex_h != height)
-   {
-      if (rgui.tex)
-         rgui.tex->Release();
-      if (FAILED(dev->CreateTexture(width, height, 1,
-                  0, D3DFMT_A8R8G8B8,
-                  D3DPOOL_MANAGED,
-                  &rgui.tex, NULL)))
-      {
-         RARCH_ERR("[D3D9]: Failed to create rgui texture\n");
-         return;
-      }
-      rgui.tex_w = width;
-      rgui.tex_h = height;
-   }
-
-   rgui.alpha_mod = alpha;
-
-
-   D3DLOCKED_RECT d3dlr;
-   if (SUCCEEDED(rgui.tex->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK)))
-   {
-      if (rgb32)
-      {
-         uint8_t *dst = (uint8_t*)d3dlr.pBits;
-         const uint32_t *src = (const uint32_t*)frame;
-         for (unsigned h = 0; h < height; h++, dst += d3dlr.Pitch, src += width)
-         {
-            memcpy(dst, src, width * sizeof(uint32_t));
-            memset(dst + width * sizeof(uint32_t), 0, d3dlr.Pitch - width * sizeof(uint32_t));
-         }
-      }
-      else
-      {
-         uint32_t *dst = (uint32_t*)d3dlr.pBits;
-         const uint16_t *src = (const uint16_t*)frame;
-         for (unsigned h = 0; h < height; h++, dst += d3dlr.Pitch >> 2, src += width)
-         {
-            for (unsigned w = 0; w < width; w++)
-            {
-               uint16_t c = src[w];
-               uint32_t r = (c >> 12) & 0xf;
-               uint32_t g = (c >>  8) & 0xf;
-               uint32_t b = (c >>  4) & 0xf;
-               uint32_t a = (c >>  0) & 0xf;
-               r = ((r << 4) | r) << 16;
-               g = ((g << 4) | g) <<  8;
-               b = ((b << 4) | b) <<  0;
-               a = ((a << 4) | a) << 24;
-               dst[w] = r | g | b | a;
-            }
-         }
-      }
-
-      rgui.tex->UnlockRect(0);
-   }
-}
-
-void D3DVideo::set_rgui_texture_enable(bool state, bool fullscreen)
-{
-   rgui.enabled = state;
-   rgui.fullscreen = fullscreen;
-}
-#endif
-
-static void *d3d9_init(const video_info_t *info, const input_driver_t **input,
-      void **input_data)
-{
-   try
-   {
-     D3DVideo *vid = new D3DVideo(info);
-     if (!vid)
-        return NULL;
-
-     if (input && input_data)
-     {
-        Callback::dinput = input_dinput.init();
-        *input = Callback::dinput ? &input_dinput : NULL;
-        *input_data = Callback::dinput;
-     }
-
-     return vid;
-   }
-   catch (const std::exception &e)
-   {
-      RARCH_ERR("[D3D9]: Failed to init D3D9 (%s, code: 0x%x).\n", e.what(), (unsigned)Callback::d3d_err);
-      return NULL;
-   }
-}
-
 static bool d3d9_frame(void *data, const void *frame,
       unsigned width, unsigned height, unsigned pitch,
       const char *msg)
@@ -1495,7 +189,7 @@ static void d3d9_set_osd_msg(void *data, const char *msg, void *userdata)
 
 static void d3d9_show_mouse(void *data, bool state)
 {
-   show_cursor(state);
+   reinterpret_cast<D3DVideo*>(data)->show_cursor(state);
 }
 
 #ifdef HAVE_MENU
@@ -1535,6 +229,20 @@ static void d3d9_get_poke_interface(void *data, const video_poke_interface_t **i
    *iface = &d3d9_poke_interface;
 }
 
+static void *d3d9_init(const video_info_t *info, const input_driver_t **input,
+      void **input_data)
+{
+   D3DVideo *vid = new D3DVideo(info, input, input_data);
+
+   if (!vid)
+   {
+      RARCH_ERR("[D3D]: Failed to init D3D.\n");
+      return NULL;
+   }
+
+   return vid;
+}
+
 const video_driver_t video_d3d9 = {
    d3d9_init,
    d3d9_frame,
diff --git a/gfx/d3d9/d3d9.hpp b/gfx/d3d9/d3d9.hpp
index 17173f2d19..e7bfd86798 100644
--- a/gfx/d3d9/d3d9.hpp
+++ b/gfx/d3d9/d3d9.hpp
@@ -55,7 +55,8 @@ typedef struct
 class D3DVideo
 {
    public:
-      D3DVideo(const video_info_t* info);
+      D3DVideo(const video_info_t* info, const input_driver_t **input,
+      void **input_data);
       bool frame(const void* frame,
             unsigned width, unsigned height, unsigned pitch,
             const char *msg);
@@ -76,6 +77,8 @@ class D3DVideo
 
       void overlay_render(overlay_t &overlay);
 
+      void show_cursor(bool show);
+
 #ifdef HAVE_OVERLAY
       bool overlay_load(const texture_image *images, unsigned num_images);
       void overlay_tex_geom(unsigned index, float x, float y, float w, float h);
@@ -118,13 +121,13 @@ class D3DVideo
 
       struct gfx_shader shader;
 
-      void process();
+      void process(void);
 
-      void init(const video_info_t &info);
-      void init_base(const video_info_t &info);
-      void make_d3dpp(const video_info_t &info, D3DPRESENT_PARAMETERS &d3dpp);
-      void deinit();
-      RECT monitor_rect();
+      void init(const video_info_t *info);
+      void init_base(const video_info_t *info);
+      void make_d3dpp(const video_info_t *info, D3DPRESENT_PARAMETERS *d3dpp);
+      void deinit(void);
+      RECT monitor_rect(void);
 
       video_info_t video_info;
 
@@ -136,21 +139,21 @@ class D3DVideo
       void deinit_cg();
 #endif
 
-      void init_imports();
-      void init_luts();
-      void init_singlepass();
-      void init_multipass();
-      bool init_chain(const video_info_t &video_info);
+      void init_imports(void);
+      void init_luts(void);
+      void init_singlepass(void);
+      void init_multipass(void);
+      bool init_chain(const video_info_t *video_info);
       std::unique_ptr<RenderChain> chain;
-      void deinit_chain();
+      void deinit_chain(void);
 
-      bool init_font();
-      void deinit_font();
+      bool init_font(void);
+      void deinit_font(void);
       RECT font_rect;
       RECT font_rect_shifted;
       uint32_t font_color;
 
-      void update_title();
+      void update_title(void);
 
 #ifdef HAVE_OVERLAY
       bool overlays_enabled;
diff --git a/gfx/d3d9/d3d9_pc.cpp b/gfx/d3d9/d3d9_pc.cpp
new file mode 100644
index 0000000000..9930934e4e
--- /dev/null
+++ b/gfx/d3d9/d3d9_pc.cpp
@@ -0,0 +1,1303 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2013 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2013 - Daniel De Matteis
+ *  Copyright (C) 2012      - OV2
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// This driver is merged from the external RetroArch-D3D9 driver.
+// It is written in C++11 (should be compat with MSVC 2010).
+// Might get rewritten in C99 if I have lots of time to burn.
+
+#include "d3d9.hpp"
+#include "render_chain.hpp"
+#include "../../file.h"
+#include "../context/win32_common.h"
+
+#ifdef _MSC_VER
+#ifndef _XBOX
+#pragma comment( lib, "d3d9" )
+#pragma comment( lib, "d3dx9" )
+#pragma comment( lib, "cgd3d9" )
+#pragma comment( lib, "dxguid" )
+#endif
+#endif
+
+#ifndef _XBOX
+#define IDI_ICON 1
+#define MAX_MONITORS 9
+
+namespace Monitor
+{
+   static HMONITOR last_hm;
+   static HMONITOR all_hms[MAX_MONITORS];
+   static unsigned num_mons;
+   static unsigned cur_mon_id;
+}
+
+static BOOL CALLBACK monitor_enum_proc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData)
+{
+   Monitor::all_hms[Monitor::num_mons++] = hMonitor;
+   return TRUE;
+}
+
+extern "C" bool dinput_handle_message(void *dinput, UINT message, WPARAM wParam, LPARAM lParam);
+
+namespace Callback
+{
+   static bool quit = false;
+   static D3DVideo *curD3D = NULL;
+   static HRESULT d3d_err;
+   static void *dinput;
+
+   LRESULT CALLBACK WindowProc(HWND hWnd, UINT message,
+         WPARAM wParam, LPARAM lParam)
+   {
+      switch (message)
+      {
+         case WM_CREATE:
+            LPCREATESTRUCT p_cs;
+            p_cs = (LPCREATESTRUCT)lParam;
+            curD3D = (D3DVideo*)p_cs->lpCreateParams;
+            break;
+
+         case WM_CHAR:
+         case WM_KEYDOWN:
+         case WM_KEYUP:
+         case WM_SYSKEYUP:
+         case WM_SYSKEYDOWN:
+            return win32_handle_keyboard_event(hWnd, message, wParam, lParam);
+
+         case WM_DESTROY:
+            quit = true;
+            return 0;
+
+         case WM_SIZE:
+            unsigned new_width, new_height;
+            new_width = LOWORD(lParam);
+            new_height = HIWORD(lParam);
+
+            if (new_width && new_height)
+               curD3D->resize(new_width, new_height);
+            return 0;
+      }
+      if (dinput_handle_message(dinput, message, wParam, lParam))
+         return 0;
+      return DefWindowProc(hWnd, message, wParam, lParam);
+   }
+}
+
+void D3DVideo::show_cursor(bool show)
+{
+   if (show)
+      while (ShowCursor(TRUE) < 0);
+   else
+      while (ShowCursor(FALSE) >= 0);
+}
+
+// Multi-monitor support.
+RECT D3DVideo::monitor_rect(void)
+{
+   Monitor::num_mons = 0;
+   EnumDisplayMonitors(NULL, NULL, monitor_enum_proc, 0);
+
+   if (!Monitor::last_hm)
+      Monitor::last_hm = MonitorFromWindow(GetDesktopWindow(), MONITOR_DEFAULTTONEAREST);
+   HMONITOR hm_to_use = Monitor::last_hm;
+
+   unsigned fs_monitor = g_settings.video.monitor_index;
+   if (fs_monitor && fs_monitor <= Monitor::num_mons && Monitor::all_hms[fs_monitor - 1])
+   {
+      hm_to_use = Monitor::all_hms[fs_monitor - 1];
+      Monitor::cur_mon_id = fs_monitor - 1;
+   }
+   else
+   {
+      for (unsigned i = 0; i < Monitor::num_mons; i++)
+      {
+         if (Monitor::all_hms[i] == hm_to_use)
+         {
+            Monitor::cur_mon_id = i;
+            break;
+         }
+      }
+   }
+
+   MONITORINFOEX current_mon;
+   memset(&current_mon, 0, sizeof(current_mon));
+   current_mon.cbSize = sizeof(MONITORINFOEX);
+   GetMonitorInfo(hm_to_use, (MONITORINFO*)&current_mon);
+
+   return current_mon.rcMonitor;
+}
+#endif
+
+void D3DVideo::init_base(const video_info_t *info)
+{
+   D3DPRESENT_PARAMETERS d3dpp;
+   make_d3dpp(info, &d3dpp);
+
+   g_pD3D = Direct3DCreate9(D3D_SDK_VERSION);
+   if (!g_pD3D)
+      throw std::runtime_error("Failed to create D3D9 interface!");
+
+   if (FAILED(Callback::d3d_err = g_pD3D->CreateDevice(
+               Monitor::cur_mon_id,
+               D3DDEVTYPE_HAL,
+               hWnd,
+               D3DCREATE_HARDWARE_VERTEXPROCESSING,
+               &d3dpp,
+               &dev)))
+   {
+      RARCH_WARN("[D3D9]: Failed to init device with hardware vertex processing (code: 0x%x). Trying to fall back to software vertex processing.\n",
+                 (unsigned)Callback::d3d_err);
+
+      if (FAILED(Callback::d3d_err = g_pD3D->CreateDevice(
+                  Monitor::cur_mon_id,
+                  D3DDEVTYPE_HAL,
+                  hWnd,
+                  D3DCREATE_SOFTWARE_VERTEXPROCESSING,
+                  &d3dpp,
+                  &dev)))
+      {
+         throw std::runtime_error("Failed to init device");
+      }
+   }
+}
+
+void D3DVideo::make_d3dpp(const video_info_t *info, D3DPRESENT_PARAMETERS *d3dpp)
+{
+   memset(&d3dpp, 0, sizeof(d3dpp));
+
+   d3dpp->Windowed = g_settings.video.windowed_fullscreen || !info->fullscreen;
+
+   if (info->vsync)
+   {
+      switch (g_settings.video.swap_interval)
+      {
+         default:
+         case 1: d3dpp->PresentationInterval = D3DPRESENT_INTERVAL_ONE; break;
+         case 2: d3dpp->PresentationInterval = D3DPRESENT_INTERVAL_TWO; break;
+         case 3: d3dpp->PresentationInterval = D3DPRESENT_INTERVAL_THREE; break;
+         case 4: d3dpp->PresentationInterval = D3DPRESENT_INTERVAL_FOUR; break;
+      }
+   }
+   else
+      d3dpp->PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
+
+   d3dpp->SwapEffect = D3DSWAPEFFECT_DISCARD;
+   d3dpp->hDeviceWindow = hWnd;
+   d3dpp->BackBufferCount = 2;
+   d3dpp->BackBufferFormat = !d3dpp->Windowed ? D3DFMT_X8R8G8B8 : D3DFMT_UNKNOWN;
+
+   if (!d3dpp->Windowed)
+   {
+      d3dpp->BackBufferWidth = screen_width;
+      d3dpp->BackBufferHeight = screen_height;
+   }
+}
+
+void D3DVideo::init(const video_info_t *info)
+{
+   if (!g_pD3D)
+      init_base(info);
+   else if (needs_restore)
+   {
+      D3DPRESENT_PARAMETERS d3dpp;
+      make_d3dpp(info, &d3dpp);
+      if (dev->Reset(&d3dpp) != D3D_OK)
+      {
+         HRESULT res = dev->TestCooperativeLevel();
+         const char *err;
+         switch (res)
+         {
+            case D3DERR_DEVICELOST:
+               err = "DEVICELOST";
+               break;
+
+            case D3DERR_DEVICENOTRESET:
+               err = "DEVICENOTRESET";
+               break;
+
+            case D3DERR_DRIVERINTERNALERROR:
+               err = "DRIVERINTERNALERROR";
+               break;
+
+            default:
+               err = "Unknown";
+         }
+         // Try to recreate the device completely ...
+         RARCH_WARN("[D3D9]: Attempting to recover from dead state (%s).\n", err);
+         deinit(); 
+         g_pD3D->Release();
+         g_pD3D = NULL;
+         init_base(info);
+         RARCH_LOG("[D3D9]: Recovered from dead state.\n");
+      }
+   }
+
+   calculate_rect(screen_width, screen_height, info->force_aspect, g_extern.system.aspect_ratio);
+
+#ifdef HAVE_CG
+   if (!init_cg())
+      throw std::runtime_error("Failed to init Cg");
+#endif
+   if (!init_chain(info))
+      throw std::runtime_error("Failed to init render chain");
+   if (!init_font())
+      throw std::runtime_error("Failed to init Font");
+}
+
+void D3DVideo::set_viewport(int x, int y, unsigned width, unsigned height)
+{
+   D3DVIEWPORT9 viewport;
+   viewport.X = max(x, 0); // D3D9 doesn't support negative X/Y viewports ...
+   viewport.Y = max(y, 0);
+   viewport.Width = width;
+   viewport.Height = height;
+   viewport.MinZ = 0.0f;
+   viewport.MaxZ = 1.0f;
+
+   final_viewport = viewport;
+
+   set_font_rect(NULL);
+}
+
+void D3DVideo::set_font_rect(font_params_t *params)
+{
+   float pos_x = g_settings.video.msg_pos_x;
+   float pos_y = g_settings.video.msg_pos_y;
+   float font_size = g_settings.video.font_size;
+
+   if (params)
+   {
+      pos_x = params->x;
+      pos_y = params->y;
+      font_size *= params->scale;
+   }
+
+   font_rect.left = final_viewport.X + final_viewport.Width * pos_x;
+   font_rect.right = final_viewport.X + final_viewport.Width;
+   font_rect.top = final_viewport.Y + (1.0f - pos_y) * final_viewport.Height - font_size; 
+   font_rect.bottom = final_viewport.Height;
+
+   font_rect_shifted = font_rect;
+   font_rect_shifted.left -= 2;
+   font_rect_shifted.right -= 2;
+   font_rect_shifted.top += 2;
+   font_rect_shifted.bottom += 2;
+}
+
+void D3DVideo::set_rotation(unsigned rot)
+{
+   rotation = rot;
+}
+
+void D3DVideo::viewport_info(rarch_viewport &vp)
+{
+   vp.x      = final_viewport.X;
+   vp.y      = final_viewport.Y;
+   vp.width  = final_viewport.Width;
+   vp.height = final_viewport.Height;
+
+   vp.full_width  = screen_width;
+   vp.full_height = screen_height;
+}
+
+bool D3DVideo::read_viewport(uint8_t *buffer)
+{
+   RARCH_PERFORMANCE_INIT(d3d_read_viewport);
+   RARCH_PERFORMANCE_START(d3d_read_viewport);
+   bool ret = true;
+   IDirect3DSurface9 *target = NULL;
+   IDirect3DSurface9 *dest   = NULL;
+
+   if (FAILED(Callback::d3d_err = dev->GetRenderTarget(0, &target)))
+   {
+      ret = false;
+      goto end;
+   }
+
+   if (FAILED(Callback::d3d_err = dev->CreateOffscreenPlainSurface(screen_width, screen_height,
+        D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM,
+        &dest, NULL)))
+   {
+      ret = false;
+      goto end;
+   }
+
+   if (FAILED(Callback::d3d_err = dev->GetRenderTargetData(target, dest)))
+   {
+      ret = false;
+      goto end;
+   }
+
+   D3DLOCKED_RECT rect;
+   if (SUCCEEDED(dest->LockRect(&rect, NULL, D3DLOCK_READONLY)))
+   {
+      unsigned pitchpix = rect.Pitch / 4;
+      const uint32_t *pixels = (const uint32_t*)rect.pBits;
+      pixels += final_viewport.X;
+      pixels += (final_viewport.Height - 1) * pitchpix;
+      pixels -= final_viewport.Y * pitchpix;
+
+      for (unsigned y = 0; y < final_viewport.Height; y++, pixels -= pitchpix)
+      {
+         for (unsigned x = 0; x < final_viewport.Width; x++)
+         {
+            *buffer++ = (pixels[x] >>  0) & 0xff;
+            *buffer++ = (pixels[x] >>  8) & 0xff;
+            *buffer++ = (pixels[x] >> 16) & 0xff;
+         }
+      }
+
+      dest->UnlockRect();
+   }
+   else
+   {
+      ret = false;
+      goto end;
+   }
+
+end:
+   RARCH_PERFORMANCE_STOP(d3d_read_viewport);
+   if (target)
+      target->Release();
+   if (dest)
+      dest->Release();
+   return ret;
+}
+
+void D3DVideo::calculate_rect(unsigned width, unsigned height,
+   bool keep, float desired_aspect)
+{
+   if (g_settings.video.scale_integer)
+   {
+      struct rarch_viewport vp = {0};
+      gfx_scale_integer(&vp, width, height, desired_aspect, keep);
+      set_viewport(vp.x, vp.y, vp.width, vp.height);
+   }
+   else if (!keep)
+      set_viewport(0, 0, width, height);
+   else
+   {
+      if (g_settings.video.aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
+      {
+         const rarch_viewport_t &custom = g_extern.console.screen.viewports.custom_vp;
+         set_viewport(custom.x, custom.y, custom.width, custom.height);
+      }
+      else
+      {
+         float device_aspect = static_cast<float>(width) / static_cast<float>(height);
+         if (fabsf(device_aspect - desired_aspect) < 0.0001f)
+            set_viewport(0, 0, width, height);
+         else if (device_aspect > desired_aspect)
+         {
+            float delta = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f;
+            set_viewport(int(roundf(width * (0.5f - delta))), 0, unsigned(roundf(2.0f * width * delta)), height);
+         }
+         else
+         {
+            float delta = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f;
+            set_viewport(0, int(roundf(height * (0.5f - delta))), width, unsigned(roundf(2.0f * height * delta)));
+         }
+      }
+   }
+}
+
+D3DVideo::D3DVideo(const video_info_t *info, const input_driver_t **input,
+      void **input_data) :
+   g_pD3D(NULL), dev(NULL), font(NULL),
+   rotation(0), needs_restore(false), cgCtx(NULL), overlays_enabled(false)
+{
+   should_resize = false;
+   gfx_set_dwm();
+
+#ifdef HAVE_MENU
+   memset(&rgui, 0, sizeof(rgui));
+   rgui.tex_coords.x = 0;
+   rgui.tex_coords.y = 0;
+   rgui.tex_coords.w = 1;
+   rgui.tex_coords.h = 1;
+   rgui.vert_coords.x = 0;
+   rgui.vert_coords.y = 1;
+   rgui.vert_coords.w = 1;
+   rgui.vert_coords.h = -1;
+#endif
+
+   memset(&windowClass, 0, sizeof(windowClass));
+   windowClass.cbSize        = sizeof(windowClass);
+   windowClass.style         = CS_HREDRAW | CS_VREDRAW;
+   windowClass.lpfnWndProc   = Callback::WindowProc;
+   windowClass.hInstance     = NULL;
+   windowClass.hCursor       = LoadCursor(NULL, IDC_ARROW);
+   windowClass.lpszClassName = "RetroArch";
+   windowClass.hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICON));
+   windowClass.hIconSm = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0);
+   if (!info->fullscreen)
+      windowClass.hbrBackground = (HBRUSH)COLOR_WINDOW;
+
+   RegisterClassEx(&windowClass);
+   RECT mon_rect = monitor_rect();
+
+   bool windowed_full = g_settings.video.windowed_fullscreen;
+
+   unsigned full_x = (windowed_full || info->width  == 0) ? (mon_rect.right  - mon_rect.left) : info->width;
+   unsigned full_y = (windowed_full || info->height == 0) ? (mon_rect.bottom - mon_rect.top)  : info->height;
+   RARCH_LOG("[D3D9]: Monitor size: %dx%d.\n", (int)(mon_rect.right  - mon_rect.left), (int)(mon_rect.bottom - mon_rect.top));
+
+   screen_width  = info->fullscreen ? full_x : info->width;
+   screen_height = info->fullscreen ? full_y : info->height;
+
+   unsigned win_width  = screen_width;
+   unsigned win_height = screen_height;
+
+   if (!info->fullscreen)
+   {
+      RECT rect   = {0};
+      rect.right  = screen_width;
+      rect.bottom = screen_height;
+      AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE);
+      win_width  = rect.right - rect.left;
+      win_height = rect.bottom - rect.top;
+   }
+
+   char buffer[128];
+   gfx_get_fps(buffer, sizeof(buffer), NULL, 0);
+   std::string title = buffer;
+   title += " || Direct3D9";
+
+   hWnd = CreateWindowEx(0, "RetroArch", title.c_str(),
+         info->fullscreen ?
+         (WS_EX_TOPMOST | WS_POPUP) : WS_OVERLAPPEDWINDOW,
+         info->fullscreen ? mon_rect.left : CW_USEDEFAULT,
+         info->fullscreen ? mon_rect.top  : CW_USEDEFAULT,
+         win_width, win_height,
+         NULL, NULL, NULL, this);
+
+   driver.display_type  = RARCH_DISPLAY_WIN32;
+   driver.video_display = 0;
+   driver.video_window  = (uintptr_t)hWnd;
+
+   show_cursor(!info->fullscreen
+#ifdef HAVE_OVERLAY
+      || overlays_enabled
+#endif
+   );
+   Callback::quit = false;
+
+   ShowWindow(hWnd, SW_RESTORE);
+   UpdateWindow(hWnd);
+   SetForegroundWindow(hWnd);
+   SetFocus(hWnd);
+
+   // This should only be done once here
+   // to avoid set_shader() to be overridden
+   // later.
+#ifdef HAVE_CG
+   enum rarch_shader_type type = gfx_shader_parse_type(g_settings.video.shader_path, RARCH_SHADER_NONE);
+   if (g_settings.video.shader_enable && type == RARCH_SHADER_CG)
+      cg_shader = g_settings.video.shader_path;
+#endif
+
+   process_shader();
+
+   video_info = *info;
+   init(&video_info);
+
+   if (input && input_data)
+   {
+      Callback::dinput = input_dinput.init();
+      *input = Callback::dinput ? &input_dinput : NULL;
+      *input_data = Callback::dinput;
+   }
+
+   RARCH_LOG("[D3D9]: Init complete.\n");
+}
+
+void D3DVideo::deinit()
+{
+   deinit_font();
+   deinit_chain();
+   deinit_cg();
+
+   needs_restore = false;
+}
+
+#ifdef HAVE_OVERLAY
+void D3DVideo::free_overlays()
+{
+   for (unsigned i = 0; i < overlays.size(); i++)
+      free_overlay(overlays[i]);
+   overlays.clear();
+}
+#endif
+
+void D3DVideo::free_overlay(overlay_t &overlay)
+{
+   if (overlay.tex)
+      overlay.tex->Release();
+   if (overlay.vert_buf)
+      overlay.vert_buf->Release();
+}
+
+D3DVideo::~D3DVideo()
+{
+   deinit();
+#ifdef HAVE_OVERLAY
+   free_overlays();
+#endif
+#ifdef HAVE_MENU
+   free_overlay(rgui);
+#endif
+   if (dev)
+      dev->Release();
+   if (g_pD3D)
+      g_pD3D->Release();
+
+   Monitor::last_hm = MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
+   DestroyWindow(hWnd);
+
+   UnregisterClass("RetroArch", GetModuleHandle(NULL));
+}
+
+bool D3DVideo::restore()
+{
+   deinit();
+   try
+   {
+      needs_restore = true;
+      init(&video_info);
+      needs_restore = false;
+   }
+   catch (const std::exception &e)
+   {
+      RARCH_ERR("[D3D9]: Restore error: (%s).\n", e.what());
+      needs_restore = true;
+   }
+
+   return !needs_restore;
+}
+
+bool D3DVideo::frame(const void *frame,
+      unsigned width, unsigned height, unsigned pitch,
+      const char *msg)
+{
+   if (!frame)
+      return true;
+
+   RARCH_PERFORMANCE_INIT(d3d_frame);
+   RARCH_PERFORMANCE_START(d3d_frame);
+   // We cannot recover in fullscreen.
+   if (needs_restore && IsIconic(hWnd))
+      return true;
+
+   if (needs_restore && !restore())
+   {
+      RARCH_ERR("[D3D9]: Failed to restore.\n");
+      return false;
+   }
+
+   if (should_resize)
+   {
+      calculate_rect(screen_width, screen_height, video_info.force_aspect, g_extern.system.aspect_ratio);
+      chain->set_final_viewport(final_viewport);
+      recompute_pass_sizes();
+
+      should_resize = false;
+   }
+
+   // render_chain() only clears out viewport, clear out everything.
+   D3DVIEWPORT9 screen_vp;
+   screen_vp.X = 0;
+   screen_vp.Y = 0;
+   screen_vp.MinZ = 0;
+   screen_vp.MaxZ = 1;
+   screen_vp.Width = screen_width;
+   screen_vp.Height = screen_height;
+   dev->SetViewport(&screen_vp);
+   dev->Clear(0, 0, D3DCLEAR_TARGET, 0, 1, 0);
+
+   // Insert black frame first, so we can screenshot, etc.
+   if (g_settings.video.black_frame_insertion)
+   {
+      if (dev->Present(NULL, NULL, NULL, NULL) != D3D_OK)
+      {
+         needs_restore = true;
+         return true;
+      }
+      dev->Clear(0, 0, D3DCLEAR_TARGET, 0, 1, 0);
+   }
+
+   if (!chain->render(frame, width, height, pitch, rotation))
+   {
+      RARCH_ERR("[D3D9]: Failed to render scene.\n");
+      return false;
+   }
+
+   render_msg(msg);
+
+#ifdef HAVE_MENU
+   if (rgui.enabled)
+      overlay_render(rgui);
+#endif
+
+#ifdef HAVE_OVERLAY
+   if (overlays_enabled)
+   {
+      for (unsigned i = 0; i < overlays.size(); i++)
+         overlay_render(overlays[i]);
+   }
+#endif
+
+   RARCH_PERFORMANCE_STOP(d3d_frame);
+
+   if (dev->Present(NULL, NULL, NULL, NULL) != D3D_OK)
+   {
+      needs_restore = true;
+      return true;
+   }
+
+   update_title();
+   return true;
+}
+
+void D3DVideo::render_msg(const char *msg, font_params_t *params)
+{
+   if (params)
+      set_font_rect(params);
+
+   if (msg && SUCCEEDED(dev->BeginScene()))
+   {
+      font->DrawTextA(NULL,
+            msg,
+            -1,
+            &font_rect_shifted,
+            DT_LEFT,
+            ((font_color >> 2) & 0x3f3f3f) | 0xff000000);
+
+      font->DrawTextA(NULL,
+            msg,
+            -1,
+            &font_rect,
+            DT_LEFT,
+            font_color | 0xff000000);
+
+      dev->EndScene();
+   }
+
+   if (params)
+      set_font_rect(NULL);
+}
+
+void D3DVideo::set_nonblock_state(bool state)
+{
+   video_info.vsync = !state;
+   restore();
+}
+
+bool D3DVideo::alive()
+{
+   process();
+   return !Callback::quit;
+}
+
+bool D3DVideo::focus() const
+{
+   return GetFocus() == hWnd;
+}
+
+void D3DVideo::process()
+{
+#ifndef _XBOX
+   MSG msg;
+   while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+   {
+      TranslateMessage(&msg);
+      DispatchMessage(&msg);
+   }
+#endif
+}
+
+#ifdef HAVE_CG
+bool D3DVideo::init_cg()
+{
+   cgCtx = cgCreateContext();
+   if (cgCtx == NULL)
+      return false;
+
+   RARCH_LOG("[D3D9 Cg]: Created context.\n");
+
+   HRESULT ret = cgD3D9SetDevice(dev);
+   if (FAILED(ret))
+      return false;
+
+   return true;
+}
+
+void D3DVideo::deinit_cg()
+{
+   if (cgCtx)
+   {
+      cgD3D9UnloadAllPrograms();
+      cgD3D9SetDevice(NULL);
+      cgDestroyContext(cgCtx);
+      cgCtx = NULL;
+   }
+}
+#endif
+
+void D3DVideo::init_singlepass()
+{
+   memset(&shader, 0, sizeof(shader));
+   shader.passes = 1;
+   gfx_shader_pass &pass = shader.pass[0];
+   pass.fbo.valid = true;
+   pass.fbo.scale_x = pass.fbo.scale_y = 1.0;
+   pass.fbo.type_x = pass.fbo.type_y = RARCH_SCALE_VIEWPORT;
+   strlcpy(pass.source.cg, cg_shader.c_str(), sizeof(pass.source.cg));
+}
+
+void D3DVideo::init_imports()
+{
+   if (!shader.variables)
+      return;
+
+   state_tracker_info tracker_info = {0};
+
+   tracker_info.wram = (uint8_t*)pretro_get_memory_data(RETRO_MEMORY_SYSTEM_RAM);
+   tracker_info.info = shader.variable;
+   tracker_info.info_elem = shader.variables;
+
+#ifdef HAVE_PYTHON
+   if (*shader.script_path)
+   {
+      tracker_info.script = shader.script_path;
+      tracker_info.script_is_file = true;
+   }
+
+   tracker_info.script_class = *shader.script_class ? shader.script_class : NULL;
+#endif
+
+   state_tracker_t *state_tracker = state_tracker_init(&tracker_info);
+   if (!state_tracker)
+      throw std::runtime_error("Failed to initialize state tracker.");
+
+   std::shared_ptr<state_tracker_t> tracker(state_tracker, [](state_tracker_t *tracker) {
+            state_tracker_free(tracker);
+         });
+
+   chain->add_state_tracker(tracker);
+}
+
+void D3DVideo::init_luts()
+{
+   for (unsigned i = 0; i < shader.luts; i++)
+   {
+      chain->add_lut(shader.lut[i].id, shader.lut[i].path,
+         shader.lut[i].filter == RARCH_FILTER_UNSPEC ?
+            g_settings.video.smooth :
+            (shader.lut[i].filter == RARCH_FILTER_LINEAR));
+   }
+}
+
+void D3DVideo::init_multipass()
+{
+   config_file_t *conf = config_file_new(cg_shader.c_str());
+   if (!conf)
+      throw std::runtime_error("Failed to load preset");
+
+   memset(&shader, 0, sizeof(shader));
+
+   if (!gfx_shader_read_conf_cgp(conf, &shader))
+   {
+      config_file_free(conf);
+      throw std::runtime_error("Failed to parse CGP file.");
+   }
+
+   config_file_free(conf);
+
+   gfx_shader_resolve_relative(&shader, cg_shader.c_str());
+
+   RARCH_LOG("[D3D9 Meta-Cg] Found %d shaders.\n", shader.passes);
+
+   for (unsigned i = 0; i < shader.passes; i++)
+   {
+      if (!shader.pass[i].fbo.valid)
+      {
+         shader.pass[i].fbo.scale_x = shader.pass[i].fbo.scale_y = 1.0f;
+         shader.pass[i].fbo.type_x = shader.pass[i].fbo.type_y = RARCH_SCALE_INPUT;
+      }
+   }
+
+   bool use_extra_pass = shader.passes < GFX_MAX_SHADERS && shader.pass[shader.passes - 1].fbo.valid;
+   if (use_extra_pass)
+   {
+      shader.passes++;
+      gfx_shader_pass &dummy_pass = shader.pass[shader.passes - 1];
+      dummy_pass.fbo.scale_x = dummy_pass.fbo.scale_y = 1.0f;
+      dummy_pass.fbo.type_x = dummy_pass.fbo.type_y = RARCH_SCALE_VIEWPORT;
+      dummy_pass.filter = RARCH_FILTER_UNSPEC;
+   }
+   else
+   {
+      gfx_shader_pass &pass = shader.pass[shader.passes - 1];
+      pass.fbo.scale_x = pass.fbo.scale_y = 1.0f;
+      pass.fbo.type_x = pass.fbo.type_y = RARCH_SCALE_VIEWPORT;
+   }
+}
+
+bool D3DVideo::set_shader(const std::string &path)
+{
+   auto old_shader = cg_shader;
+   bool restore_old = false;
+   try
+   {
+      cg_shader = path;
+      process_shader();
+      restore();
+   }
+   catch (const std::exception &e)
+   {
+      RARCH_ERR("[D3D9]: Setting shader failed: (%s).\n", e.what());
+      restore_old = true;
+   }
+
+   if (restore_old)
+   {
+      cg_shader = old_shader;
+      process_shader();
+      restore();
+   }
+
+   return !restore_old;
+}
+
+void D3DVideo::process_shader()
+{
+   if (strcmp(path_get_extension(cg_shader.c_str()), "cgp") == 0)
+      init_multipass();
+   else
+      init_singlepass();
+}
+
+void D3DVideo::recompute_pass_sizes()
+{
+   try
+   {
+      LinkInfo link_info = {0};
+      link_info.pass = &shader.pass[0];
+      link_info.tex_w = link_info.tex_h = video_info.input_scale * RARCH_SCALE_BASE;
+
+      unsigned current_width = link_info.tex_w;
+      unsigned current_height = link_info.tex_h;
+      unsigned out_width = 0;
+      unsigned out_height = 0;
+
+      chain->set_pass_size(0, current_width, current_height);
+      for (unsigned i = 1; i < shader.passes; i++)
+      {
+         RenderChain::convert_geometry(link_info,
+               out_width, out_height,
+               current_width, current_height, final_viewport);
+
+         link_info.tex_w = next_pow2(out_width);
+         link_info.tex_h = next_pow2(out_height);
+
+         chain->set_pass_size(i, link_info.tex_w, link_info.tex_h);
+
+         current_width = out_width;
+         current_height = out_height;
+
+         link_info.pass = &shader.pass[i];
+      }
+   }
+   catch (const std::exception& e)
+   {
+      RARCH_ERR("[D3D9]: Render chain error: (%s).\n", e.what());
+   }
+}
+
+bool D3DVideo::init_chain(const video_info_t *video_info)
+{
+   try
+   {
+      // Setup information for first pass.
+      LinkInfo link_info = {0};
+
+      link_info.pass = &shader.pass[0];
+      link_info.tex_w = link_info.tex_h = video_info->input_scale * RARCH_SCALE_BASE;
+
+      chain = std::unique_ptr<RenderChain>(
+            new RenderChain(
+               video_info,
+               dev, cgCtx,
+               link_info,
+               video_info->rgb32 ? RenderChain::ARGB : RenderChain::RGB565,
+               final_viewport));
+
+      unsigned current_width = link_info.tex_w;
+      unsigned current_height = link_info.tex_h;
+      unsigned out_width = 0;
+      unsigned out_height = 0;
+
+      for (unsigned i = 1; i < shader.passes; i++)
+      {
+         RenderChain::convert_geometry(link_info,
+               out_width, out_height,
+               current_width, current_height, final_viewport);
+
+         link_info.pass = &shader.pass[i];
+         link_info.tex_w = next_pow2(out_width);
+         link_info.tex_h = next_pow2(out_height);
+
+         current_width = out_width;
+         current_height = out_height;
+
+         chain->add_pass(link_info);
+      }
+
+      init_luts();
+      init_imports();
+   }
+   catch (const std::exception &e)
+   {
+      RARCH_ERR("[D3D9]: Render chain error: (%s).\n", e.what());
+      return false;
+   }
+
+   return true;
+}
+
+void D3DVideo::deinit_chain()
+{
+   chain.reset();
+}
+
+bool D3DVideo::init_font()
+{
+   D3DXFONT_DESC desc = {
+      static_cast<int>(g_settings.video.font_size), 0, 400, 0,
+      false, DEFAULT_CHARSET,
+      OUT_TT_PRECIS,
+      CLIP_DEFAULT_PRECIS,
+      DEFAULT_PITCH,
+      "Verdana" // Hardcode ftl :(
+   };
+
+   uint32_t r = static_cast<uint32_t>(g_settings.video.msg_color_r * 255) & 0xff;
+   uint32_t g = static_cast<uint32_t>(g_settings.video.msg_color_g * 255) & 0xff;
+   uint32_t b = static_cast<uint32_t>(g_settings.video.msg_color_b * 255) & 0xff;
+   font_color = D3DCOLOR_XRGB(r, g, b);
+
+   return SUCCEEDED(D3DXCreateFontIndirect(dev, &desc, &font));
+}
+
+void D3DVideo::deinit_font()
+{
+   if (font)
+      font->Release();
+   font = NULL;
+}
+
+void D3DVideo::update_title()
+{
+   char buffer[128], buffer_fps[128];
+   bool fps_draw = g_settings.fps_show;
+   if (gfx_get_fps(buffer, sizeof(buffer), fps_draw ? buffer_fps : NULL, sizeof(buffer_fps)))
+   {
+      std::string title = buffer;
+      title += " || Direct3D9";
+      SetWindowText(hWnd, title.c_str());
+   }
+
+   if (fps_draw)
+      msg_queue_push(g_extern.msg_queue, buffer_fps, 1, 1);
+
+   g_extern.frame_count++;
+}
+
+void D3DVideo::resize(unsigned new_width, unsigned new_height)
+{
+   if (!dev)
+      return;
+
+   RARCH_LOG("[D3D9]: Resize %ux%u.\n", new_width, new_height);
+
+   if (new_width != video_info.width || new_height != video_info.height)
+   {
+      video_info.width = screen_width = new_width;
+      video_info.height = screen_height = new_height;
+      restore();
+   }
+}
+
+#ifdef HAVE_OVERLAY
+bool D3DVideo::overlay_load(const texture_image *images, unsigned num_images)
+{
+   free_overlays();
+   overlays.resize(num_images);
+
+   for (unsigned i = 0; i < num_images; i++)
+   {
+      unsigned width = images[i].width;
+      unsigned height = images[i].height;
+      overlay_t &overlay = overlays[i];
+      if (FAILED(dev->CreateTexture(width, height, 1,
+                  0,
+                  D3DFMT_A8R8G8B8,
+                  D3DPOOL_MANAGED,
+                  &overlay.tex, NULL)))
+      {
+         RARCH_ERR("[D3D9]: Failed to create overlay texture\n");
+         return false;
+      }
+
+      D3DLOCKED_RECT d3dlr;
+      if (SUCCEEDED(overlay.tex->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK)))
+      {
+         uint32_t *dst = static_cast<uint32_t*>(d3dlr.pBits);
+         const uint32_t *src = images[i].pixels;
+         unsigned pitch = d3dlr.Pitch >> 2;
+         for (unsigned y = 0; y < height; y++, dst += pitch, src += width)
+            memcpy(dst, src, width << 2);
+         overlay.tex->UnlockRect(0);
+      }
+
+      overlay.tex_w = width;
+      overlay.tex_h = height;
+      overlay_tex_geom(i, 0, 0, 1, 1); // Default. Stretch to whole screen.
+      overlay_vertex_geom(i, 0, 0, 1, 1);
+   }
+
+   return true;
+}
+
+void D3DVideo::overlay_tex_geom(unsigned index, float x, float y, float w, float h)
+{
+   overlays[index].tex_coords.x = x;
+   overlays[index].tex_coords.y = y;
+   overlays[index].tex_coords.w = w;
+   overlays[index].tex_coords.h = h;
+}
+
+void D3DVideo::overlay_vertex_geom(unsigned index, float x, float y, float w, float h)
+{
+   y = 1.0f - y;
+   h = -h;
+   overlays[index].vert_coords.x = x;
+   overlays[index].vert_coords.y = y;
+   overlays[index].vert_coords.w = w;
+   overlays[index].vert_coords.h = h;
+}
+
+void D3DVideo::overlay_enable(bool state)
+{
+   for (unsigned i = 0; i < overlays.size(); i++)
+      overlays_enabled = state;
+   show_cursor(state);
+}
+
+void D3DVideo::overlay_full_screen(bool enable)
+{
+   for (unsigned i = 0; i < overlays.size(); i++)
+      overlays[i].fullscreen = enable;
+}
+
+void D3DVideo::overlay_set_alpha(unsigned index, float mod)
+{
+   overlays[index].alpha_mod = mod;
+}
+#endif
+
+void D3DVideo::overlay_render(overlay_t &overlay)
+{  
+   if (!overlay.tex)
+      return;
+
+   struct overlay_vertex
+   {
+      float x, y, z;
+      float u, v;
+      float r, g, b, a;
+   } vert[4];
+
+   if (!overlay.vert_buf)
+   {
+      dev->CreateVertexBuffer(
+            sizeof(vert),
+            dev->GetSoftwareVertexProcessing() ? D3DUSAGE_SOFTWAREPROCESSING : 0,
+            0,
+            D3DPOOL_MANAGED,
+            &overlay.vert_buf,
+            NULL);
+   }
+
+   for (unsigned i = 0; i < 4; i++)
+   {
+      vert[i].z = 0.5f;
+      vert[i].r = vert[i].g = vert[i].b = 1.0f;
+      vert[i].a = overlay.alpha_mod;
+   }
+
+   float overlay_width = final_viewport.Width;
+   float overlay_height = final_viewport.Height;
+
+   vert[0].x = overlay.vert_coords.x * overlay_width;
+   vert[1].x = (overlay.vert_coords.x + overlay.vert_coords.w) * overlay_width;
+   vert[2].x = overlay.vert_coords.x * overlay_width;
+   vert[3].x = (overlay.vert_coords.x + overlay.vert_coords.w) * overlay_width;
+   vert[0].y = overlay.vert_coords.y * overlay_height;
+   vert[1].y = overlay.vert_coords.y * overlay_height;
+   vert[2].y = (overlay.vert_coords.y + overlay.vert_coords.h) * overlay_height;
+   vert[3].y = (overlay.vert_coords.y + overlay.vert_coords.h) * overlay_height;
+
+   vert[0].u = overlay.tex_coords.x;
+   vert[1].u = overlay.tex_coords.x + overlay.tex_coords.w;
+   vert[2].u = overlay.tex_coords.x;
+   vert[3].u = overlay.tex_coords.x + overlay.tex_coords.w;
+   vert[0].v = overlay.tex_coords.y;
+   vert[1].v = overlay.tex_coords.y;
+   vert[2].v = overlay.tex_coords.y + overlay.tex_coords.h;
+   vert[3].v = overlay.tex_coords.y + overlay.tex_coords.h;
+
+   // Align texels and vertices.
+   for (unsigned i = 0; i < 4; i++)
+   {
+      vert[i].x -= 0.5f;
+      vert[i].y += 0.5f;
+   }
+
+   void *verts;
+   overlay.vert_buf->Lock(0, sizeof(vert), &verts, 0);
+   memcpy(verts, vert, sizeof(vert));
+   overlay.vert_buf->Unlock();
+
+   // enable alpha
+   dev->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
+   dev->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
+   dev->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
+
+   // set vertex decl for overlay
+   D3DVERTEXELEMENT9 vElems[4] = {
+      {0, 0,  D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0},
+      {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0},
+      {0, 20, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0},
+      D3DDECL_END()
+   };
+   IDirect3DVertexDeclaration9 *vertex_decl;
+   dev->CreateVertexDeclaration(vElems, &vertex_decl);
+   dev->SetVertexDeclaration(vertex_decl);
+   vertex_decl->Release();
+
+   dev->SetStreamSource(0, overlay.vert_buf, 0, sizeof(overlay_vertex));
+
+   if (overlay.fullscreen)
+   {
+      // set viewport to full window
+      D3DVIEWPORT9 vp_full;
+      vp_full.X = 0;
+      vp_full.Y = 0;
+      vp_full.Width = screen_width;
+      vp_full.Height = screen_height;
+      vp_full.MinZ = 0.0f;
+      vp_full.MaxZ = 1.0f;
+      dev->SetViewport(&vp_full);
+   }
+
+   // render overlay
+   dev->SetTexture(0, overlay.tex);
+   dev->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
+   dev->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
+   dev->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
+   dev->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
+   if (SUCCEEDED(dev->BeginScene()))
+   {
+      dev->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
+      dev->EndScene();
+   }
+
+   // restore previous state
+   dev->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
+   dev->SetViewport(&final_viewport);
+}
+
+#ifdef HAVE_MENU
+void D3DVideo::set_rgui_texture_frame(const void *frame,
+      bool rgb32, unsigned width, unsigned height,
+      float alpha)
+{
+   if (!rgui.tex || rgui.tex_w != width || rgui.tex_h != height)
+   {
+      if (rgui.tex)
+         rgui.tex->Release();
+      if (FAILED(dev->CreateTexture(width, height, 1,
+                  0, D3DFMT_A8R8G8B8,
+                  D3DPOOL_MANAGED,
+                  &rgui.tex, NULL)))
+      {
+         RARCH_ERR("[D3D9]: Failed to create rgui texture\n");
+         return;
+      }
+      rgui.tex_w = width;
+      rgui.tex_h = height;
+   }
+
+   rgui.alpha_mod = alpha;
+
+
+   D3DLOCKED_RECT d3dlr;
+   if (SUCCEEDED(rgui.tex->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK)))
+   {
+      if (rgb32)
+      {
+         uint8_t *dst = (uint8_t*)d3dlr.pBits;
+         const uint32_t *src = (const uint32_t*)frame;
+         for (unsigned h = 0; h < height; h++, dst += d3dlr.Pitch, src += width)
+         {
+            memcpy(dst, src, width * sizeof(uint32_t));
+            memset(dst + width * sizeof(uint32_t), 0, d3dlr.Pitch - width * sizeof(uint32_t));
+         }
+      }
+      else
+      {
+         uint32_t *dst = (uint32_t*)d3dlr.pBits;
+         const uint16_t *src = (const uint16_t*)frame;
+         for (unsigned h = 0; h < height; h++, dst += d3dlr.Pitch >> 2, src += width)
+         {
+            for (unsigned w = 0; w < width; w++)
+            {
+               uint16_t c = src[w];
+               uint32_t r = (c >> 12) & 0xf;
+               uint32_t g = (c >>  8) & 0xf;
+               uint32_t b = (c >>  4) & 0xf;
+               uint32_t a = (c >>  0) & 0xf;
+               r = ((r << 4) | r) << 16;
+               g = ((g << 4) | g) <<  8;
+               b = ((b << 4) | b) <<  0;
+               a = ((a << 4) | a) << 24;
+               dst[w] = r | g | b | a;
+            }
+         }
+      }
+
+      rgui.tex->UnlockRect(0);
+   }
+}
+
+void D3DVideo::set_rgui_texture_enable(bool state, bool fullscreen)
+{
+   rgui.enabled = state;
+   rgui.fullscreen = fullscreen;
+}
+#endif
\ No newline at end of file
diff --git a/gfx/d3d9/render_chain.cpp b/gfx/d3d9/render_chain.cpp
index 4ce841cd16..e5be341139 100644
--- a/gfx/d3d9/render_chain.cpp
+++ b/gfx/d3d9/render_chain.cpp
@@ -59,12 +59,12 @@ RenderChain::~RenderChain()
       cgDestroyProgram(vStock);
 }
 
-RenderChain::RenderChain(const video_info_t &video_info,
+RenderChain::RenderChain(const video_info_t *video_info,
       IDirect3DDevice9 *dev_,
       CGcontext cgCtx_,
       const LinkInfo &info, PixelFormat fmt,
       const D3DVIEWPORT9 &final_viewport_)
-   : dev(dev_), cgCtx(cgCtx_), video_info(video_info), final_viewport(final_viewport_), frame_count(0)
+   : dev(dev_), cgCtx(cgCtx_), video_info(*video_info), final_viewport(final_viewport_), frame_count(0)
 {
    pixel_size = fmt == RGB565 ? 2 : 4;
    create_first_pass(info, fmt);
diff --git a/gfx/d3d9/render_chain.hpp b/gfx/d3d9/render_chain.hpp
index 9931e503f0..3b8c787c8e 100644
--- a/gfx/d3d9/render_chain.hpp
+++ b/gfx/d3d9/render_chain.hpp
@@ -42,7 +42,7 @@ class RenderChain
    public:
       enum PixelFormat { RGB565, ARGB };
 
-      RenderChain(const video_info_t &video_info,
+      RenderChain(const video_info_t *video_info,
             IDirect3DDevice9 *dev,
 #ifdef HAVE_CG
             CGcontext cgCtx,
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 509d98e337..44acb30e02 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -208,6 +208,7 @@
     <ClCompile Include="..\..\frontend\menu\menu_settings.c" />
     <ClCompile Include="..\..\frontend\menu\menu_context.c" />
     <ClCompile Include="..\..\gfx\d3d9\d3d9.cpp" />
+    <ClCompile Include="..\..\gfx\d3d9\d3d9_pc.cpp" />
     <ClCompile Include="..\..\gfx\d3d9\render_chain.cpp" />
     <ClCompile Include="..\..\gfx\fonts\bitmapfont.c" />
     <ClCompile Include="..\..\gfx\fonts\fonts.c" />
@@ -313,4 +314,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
index cd44d27255..5c18971bc5 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
@@ -171,6 +171,9 @@
     <ClCompile Include="..\..\deps\miniz\miniz.c">
       <Filter>deps\miniz</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\gfx\d3d9\d3d9_pc.cpp">
+      <Filter>gfx\d3d9</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h" />