Bläddra i källkod

Merge pull request #344 from MikePopoloski/master

This MakeWindowAssociation block got moved to the wrong branch of #if.
Branimir Karadžić 10 år sedan
förälder
incheckning
feafe43c35
1 ändrade filer med 5 tillägg och 5 borttagningar
  1. 5 5
      src/renderer_d3d11.cpp

+ 5 - 5
src/renderer_d3d11.cpp

@@ -685,11 +685,6 @@ BX_PRAGMA_DIAGNOSTIC_POP();
 				, &m_swapChain
 				);
 			BGFX_FATAL(SUCCEEDED(hr), Fatal::UnableToInitialize, "Failed to create swap chain.");
-
-			DX_CHECK(m_factory->MakeWindowAssociation(g_bgfxHwnd, 0
-				| DXGI_MWA_NO_WINDOW_CHANGES
-				| DXGI_MWA_NO_ALT_ENTER
-				) );
 #else
 			hr = adapter->GetParent(IID_IDXGIFactory, (void**)&m_factory);
 			BGFX_FATAL(SUCCEEDED(hr), Fatal::UnableToInitialize, "Unable to create Direct3D11 device.");
@@ -713,6 +708,11 @@ BX_PRAGMA_DIAGNOSTIC_POP();
 				, &m_swapChain
 				);
 			BGFX_FATAL(SUCCEEDED(hr), Fatal::UnableToInitialize, "Failed to create swap chain.");
+
+			DX_CHECK(m_factory->MakeWindowAssociation(g_bgfxHwnd, 0
+				| DXGI_MWA_NO_WINDOW_CHANGES
+				| DXGI_MWA_NO_ALT_ENTER
+				) );
 #endif // BX_PLATFORM_WINRT
 
 			m_numWindows = 1;