Moved DX9 device creation back to the main thread

This fixes fullscreen in DX9 and allows to remove workarounds

src/Layers/xrRenderDX9/dx9HW.cpp

@@ -36,7 +36,7 @@ void CHW::CreateDevice(SDL_Window* m_sdlWnd)
 {
     CreateD3D();
 
-    const bool bWindowed = true; //!psDeviceFlags.is(rsFullscreen);
+    const bool bWindowed = !psDeviceFlags.is(rsFullscreen);
 
     m_DriverType = Caps.bForceGPU_REF ? D3DDEVTYPE_REF : D3DDEVTYPE_HAL;
 
@@ -227,7 +227,7 @@ void CHW::Reset()
     _RELEASE(pBaseZB);
     _RELEASE(pBaseRT);
 
-    const bool bWindowed = true; // !psDeviceFlags.is(rsFullscreen);
+    const bool bWindowed = !psDeviceFlags.is(rsFullscreen);
 
     DevPP.BackBufferWidth = Device.dwWidth;
     DevPP.BackBufferHeight = Device.dwHeight;

src/xrEngine/Device_create.cpp

@@ -35,6 +35,12 @@ void CRenderDevice::Create()
     // Start all threads
     mt_bMustExit = FALSE;
 
+    // To work correctly, DX9 in fullscreen mode requires that
+    // the device must be created at the same thread where the main window was created
+    const static bool isDX9Renderer = GEnv.Render->get_dx_level() == 0x00090000;
+    if (isDX9Renderer)
+        CreateInternal();
+
     Threading::SetThreadName(NULL, "X-Ray Window thread");
     Threading::SpawnThread(PrimaryThreadProc, "X-RAY Primary thread", 0, this);
     Threading::SpawnThread(SecondaryThreadProc, "X-Ray Secondary thread", 0, this);

src/xrEngine/Device_destroy.cpp

@@ -80,4 +80,7 @@ void CRenderDevice::ResetInternal(bool precache)
 
     if (!GEnv.isDedicatedServer)
         pInput->GrabInput(true);
+
+    shouldReset = false;
+    precacheWhileReset = false;
 }

src/xrEngine/device.cpp

@@ -53,7 +53,11 @@ bool CRenderDevice::RenderBegin()
     if (GEnv.isDedicatedServer)
         return true;
 
-    switch (GEnv.Render->GetDeviceState())
+    const static bool isDX9Renderer = GEnv.Render->get_dx_level() == 0x00090000;
+    if (!isDX9Renderer)
+        LastDeviceState = GEnv.Render->GetDeviceState();
+
+    switch (LastDeviceState)
     {
     case DeviceState::Normal: break;
     case DeviceState::Lost:
@@ -63,7 +67,7 @@ bool CRenderDevice::RenderBegin()
 
     case DeviceState::NeedReset:
         // Check if the device is ready to be reset
-        ResetInternal();
+        Reset();
         return false;
 
     default: R_ASSERT(0);
@@ -185,11 +189,9 @@ void CRenderDevice::PrimaryThreadProc(void* context)
             return;
         }
 
-        if (device.shouldReset)
+        if (device.shouldReset) // never happen on DX9, will be done in message_loop()
         {
             device.ResetInternal(device.precacheWhileReset);
-            device.shouldReset = false;
-            device.precacheWhileReset = false;
         }
 
         device.ProcessFrame();
@@ -406,6 +408,8 @@ void CRenderDevice::message_loop()
         return;
     }
 
+    const static bool isDX9Renderer = GEnv.Render->get_dx_level() == 0x00090000;
+
     bool timedOut = false;
 
     while (!SDL_QuitRequested()) // SDL_PumpEvents is here
@@ -481,8 +485,17 @@ void CRenderDevice::message_loop()
             }
         }
 
+        if (isDX9Renderer)
+        {
+            LastDeviceState = GEnv.Render->GetDeviceState();
+        }
+
         if (!timedOut)
         {
+            if (isDX9Renderer && shouldReset)
+            {
+                ResetInternal(precacheWhileReset);
+            }
             primaryProcessFrame.Set();
         }
 

src/xrEngine/device.h

@@ -270,6 +270,7 @@ class ENGINE_API CRenderDevice : public CRenderDeviceBase, public IWindowHandler
     }
 
 private:
+    std::atomic<DeviceState> LastDeviceState;
     std::atomic<bool> shouldReset;
     std::atomic<bool> precacheWhileReset;
     std::atomic<bool> mtProcessingAllowed;