From ac3c4a59b6118ad0e5a325d54db49731fbec8a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Wed, 28 Oct 2015 17:54:50 -0700
Subject: [PATCH] Cleanup.

---
 src/renderer_d3d9.cpp | 69 +++++++++++++++++++++----------------------
 src/renderer_d3d9.h   |  3 --
 2 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp
index 10fe0367..18f79bdc 100644
--- a/src/renderer_d3d9.cpp
+++ b/src/renderer_d3d9.cpp
@@ -258,13 +258,11 @@ namespace bgfx { namespace d3d9
 		{ D3DFMT_RAWZ, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, false },
 	};
 
-#if BGFX_CONFIG_RENDERER_DIRECT3D9EX
 	static const GUID IID_IDirect3D9         = { 0x81bdcbca, 0x64d4, 0x426d, { 0xae, 0x8d, 0xad, 0x1, 0x47, 0xf4, 0x27, 0x5c } };
 	static const GUID IID_IDirect3DDevice9Ex = { 0xb18b10ce, 0x2649, 0x405a, { 0x87, 0xf, 0x95, 0xf7, 0x77, 0xd4, 0x31, 0x3a } };
 
 	typedef HRESULT (WINAPI *Direct3DCreate9ExFn)(UINT SDKVersion, IDirect3D9Ex**);
 	static Direct3DCreate9ExFn     Direct3DCreate9Ex;
-#endif // BGFX_CONFIG_RENDERER_DIRECT3D9EX
 	typedef IDirect3D9* (WINAPI *Direct3DCreate9Fn)(UINT SDKVersion);
 	static Direct3DCreate9Fn       Direct3DCreate9;
 	static PFN_D3DPERF_SET_MARKER  D3DPERF_SetMarker;
@@ -361,18 +359,19 @@ namespace bgfx { namespace d3d9
 					  , "Failed to initialize PIX events."
 					  );
 			}
-#if BGFX_CONFIG_RENDERER_DIRECT3D9EX
-			m_d3d9ex = NULL;
+
+			m_d3d9ex   = NULL;
+			m_deviceEx = NULL;
 
 			Direct3DCreate9Ex = (Direct3DCreate9ExFn)bx::dlsym(m_d3d9dll, "Direct3DCreate9Ex");
-			if (NULL != Direct3DCreate9Ex)
+			if (BX_ENABLED(BGFX_CONFIG_RENDERER_DIRECT3D9EX)
+			&&  NULL != Direct3DCreate9Ex)
 			{
 				Direct3DCreate9Ex(D3D_SDK_VERSION, &m_d3d9ex);
 				DX_CHECK(m_d3d9ex->QueryInterface(IID_IDirect3D9, (void**)&m_d3d9) );
 				m_pool = D3DPOOL_DEFAULT;
 			}
 			else
-#endif // BGFX_CONFIG_RENDERER_DIRECT3D9EX
 			{
 				Direct3DCreate9 = (Direct3DCreate9Fn)bx::dlsym(m_d3d9dll, "Direct3DCreate9");
 				BX_WARN(NULL != Direct3DCreate9, "Function Direct3DCreate9 not found.");
@@ -460,24 +459,29 @@ namespace bgfx { namespace d3d9
 
 				for (uint32_t ii = 0; ii < BX_COUNTOF(behaviorFlags) && NULL == m_device; ++ii)
 				{
-#if 0 // BGFX_CONFIG_RENDERER_DIRECT3D9EX
-					DX_CHECK(m_d3d9->CreateDeviceEx(m_adapter
-						, m_deviceType
-						, g_platformHooks.nwh
-						, behaviorFlags[ii]
-						, &m_params
-						, NULL
-						, &m_device
-						) );
-#else
-					DX_CHECK(m_d3d9->CreateDevice(m_adapter
-						, m_deviceType
-						, (HWND)g_platformData.nwh
-						, behaviorFlags[ii]
-						, &m_params
-						, &m_device
-						));
-#endif // BGFX_CONFIG_RENDERER_DIRECT3D9EX
+					if (NULL != m_d3d9ex)
+					{
+						DX_CHECK(m_d3d9ex->CreateDeviceEx(m_adapter
+							, m_deviceType
+							, (HWND)g_platformData.nwh
+							, behaviorFlags[ii]
+							, &m_params
+							, NULL
+							, &m_deviceEx
+							) );
+
+						m_device = m_deviceEx;
+					}
+					else
+					{
+						DX_CHECK(m_d3d9->CreateDevice(m_adapter
+							, m_deviceType
+							, (HWND)g_platformData.nwh
+							, behaviorFlags[ii]
+							, &m_params
+							, &m_device
+							) );
+					}
 				}
 			}
 
@@ -492,12 +496,10 @@ namespace bgfx { namespace d3d9
 
 			m_numWindows = 1;
 
-#if BGFX_CONFIG_RENDERER_DIRECT3D9EX
 			if (NULL != m_d3d9ex)
 			{
 				DX_CHECK(m_device->QueryInterface(IID_IDirect3DDevice9Ex, (void**)&m_deviceEx) );
 			}
-#endif // BGFX_CONFIG_RENDERER_DIRECT3D9EX
 
 			DX_CHECK(m_device->GetDeviceCaps(&m_caps) );
 
@@ -735,27 +737,23 @@ namespace bgfx { namespace d3d9
 			switch (errorState)
 			{
 			case ErrorState::CreatedDevice:
-#if BGFX_CONFIG_RENDERER_DIRECT3D9EX
 				if (NULL != m_d3d9ex)
 				{
 					DX_RELEASE(m_deviceEx, 1);
 					DX_RELEASE(m_device, 0);
 				}
 				else
-#endif // BGFX_CONFIG_RENDERER_DIRECT3D9EX
 				{
 					DX_RELEASE(m_device, 0);
 				}
 
 			case ErrorState::CreatedD3D9:
-#if BGFX_CONFIG_RENDERER_DIRECT3D9EX
 				if (NULL != m_d3d9ex)
 				{
 					DX_RELEASE(m_d3d9, 1);
 					DX_RELEASE(m_d3d9ex, 0);
 				}
 				else
-#endif // BGFX_CONFIG_RENDERER_DIRECT3D9EX
 				{
 					DX_RELEASE(m_d3d9, 0);
 				}
@@ -801,7 +799,6 @@ namespace bgfx { namespace d3d9
 				m_vertexDecls[ii].destroy();
 			}
 
-#if BGFX_CONFIG_RENDERER_DIRECT3D9EX
 			if (NULL != m_d3d9ex)
 			{
 				DX_RELEASE(m_deviceEx, 1);
@@ -810,7 +807,6 @@ namespace bgfx { namespace d3d9
 				DX_RELEASE(m_d3d9ex, 0);
 			}
 			else
-#endif // BGFX_CONFIG_RENDERER_DIRECT3D9EX
 			{
 				DX_RELEASE(m_device, 0);
 				DX_RELEASE(m_d3d9, 0);
@@ -830,6 +826,11 @@ namespace bgfx { namespace d3d9
 
 		const char* getRendererName() const BX_OVERRIDE
 		{
+			if (NULL != m_d3d9ex)
+			{
+				return BGFX_RENDERER_DIRECT3D9_NAME " Ex";
+			}
+
 			return BGFX_RENDERER_DIRECT3D9_NAME;
 		}
 
@@ -1348,12 +1349,10 @@ namespace bgfx { namespace d3d9
 		{
 			if (NULL != m_swapChain)
 			{
-#if BGFX_CONFIG_RENDERER_DIRECT3D9EX
 				if (NULL != m_deviceEx)
 				{
 					DX_CHECK(m_deviceEx->WaitForVBlank(0) );
 				}
-#endif // BGFX_CONFIG_RENDERER_DIRECT3D9EX
 
 				for (uint32_t ii = 0, num = m_numWindows; ii < num; ++ii)
 				{
@@ -1926,10 +1925,8 @@ namespace bgfx { namespace d3d9
 		D3DCAPS9 m_caps;
 #endif // BX_PLATFORM_WINDOWS
 
-#if BGFX_CONFIG_RENDERER_DIRECT3D9EX
 		IDirect3D9Ex* m_d3d9ex;
 		IDirect3DDevice9Ex* m_deviceEx;
-#endif // BGFX_CONFIG_RENDERER_DIRECT3D9EX
 
 		IDirect3D9*       m_d3d9;
 		IDirect3DDevice9* m_device;
diff --git a/src/renderer_d3d9.h b/src/renderer_d3d9.h
index e7d4ce4b..f3a1aa9b 100644
--- a/src/renderer_d3d9.h
+++ b/src/renderer_d3d9.h
@@ -10,9 +10,6 @@
 
 #if BX_PLATFORM_WINDOWS
 #	include <sal.h>
-#	if !BGFX_CONFIG_RENDERER_DIRECT3D9EX
-//#		define D3D_DISABLE_9EX
-#	endif // !BGFX_CONFIG_RENDERER_DIRECT3D9EX
 #	include <d3d9.h>
 
 #elif BX_PLATFORM_XBOX360