Move dedicated server out *_DEDICATED configuration

Now you can run dedicated server with -dedicated command line key Enabled xrD3D9-Null build on x64 platform
OpenXRay · Jan 7, 2018 · 2d37233 · 2d37233
1 parent d4c02af
commit 2d37233
Show file tree

Hide file tree

Showing 16 changed files with 148 additions and 902 deletions.
diff --git a/src/Layers/xrRender/HW.cpp b/src/Layers/xrRender/HW.cpp
@@ -42,12 +42,7 @@ void CHW::Reset(HWND hwnd)
     _RELEASE(pBaseRT);
 
 #ifndef _EDITOR
-    //#ifndef DEDICATED_SERVER
-    //  BOOL    bWindowed       = !psDeviceFlags.is (rsFullscreen);
-    //#else
-    //  BOOL    bWindowed       = TRUE;
-    //#endif
-    BOOL bWindowed = TRUE;
+    bool bWindowed = true;
     if (!GEnv.isDedicatedServer)
         bWindowed = !psDeviceFlags.is(rsFullscreen);
 
@@ -67,7 +62,7 @@ void CHW::Reset(HWND hwnd)
     }
 #endif
 
-    while (TRUE)
+    while (true)
     {
         HRESULT _hr = HW.pDevice->Reset(&DevPP);
         if (SUCCEEDED(_hr))
@@ -199,20 +194,11 @@ void CHW::CreateDevice(HWND m_hWnd, bool move_window)
     m_move_window = move_window;
     CreateD3D();
 
-    // General - select adapter and device
-    //#ifdef DEDICATED_SERVER
-    //  BOOL  bWindowed         = TRUE;
-    //#else
-    //  BOOL  bWindowed         = !psDeviceFlags.is(rsFullscreen);
-    //#endif
-
-    BOOL bWindowed = TRUE;
+    bool bWindowed = true;
 
 #ifndef _EDITOR
     if (!GEnv.isDedicatedServer)
         bWindowed = !psDeviceFlags.is(rsFullscreen);
-#else
-    bWindowed = 1;
 #endif
 
     DevAdapter = D3DADAPTER_DEFAULT;
@@ -512,14 +498,7 @@ BOOL CHW::support(D3DFORMAT fmt, DWORD type, DWORD usage)
 
 void CHW::updateWindowProps(HWND m_hWnd)
 {
-    //BOOL bWindowed = strstr(Core.Params,"-dedicated") ? TRUE : !psDeviceFlags.is(rsFullscreen);
-    //#ifndef DEDICATED_SERVER
-    //BOOL bWindowed = !psDeviceFlags.is(rsFullscreen);
-    //#else
-    //BOOL bWindowed = TRUE;
-    //#endif
-
-    BOOL bWindowed = TRUE;
+    bool bWindowed = true;
 #ifndef _EDITOR
     if (!GEnv.isDedicatedServer)
         bWindowed = !psDeviceFlags.is(rsFullscreen);

diff --git a/src/Layers/xrRender/R_Backend_Runtime.cpp b/src/Layers/xrRender/R_Backend_Runtime.cpp
@@ -15,10 +15,7 @@
 
 void CBackend::OnFrameEnd()
 {
-//#ifndef DEDICATED_SERVER
-#ifndef _EDITOR
     if (!GEnv.isDedicatedServer)
-#endif
     {
 #if defined(USE_DX10) || defined(USE_DX11)
         HW.pContext->ClearState();
@@ -34,15 +31,11 @@ void CBackend::OnFrameEnd()
         Invalidate();
 #endif // USE_DX10
     }
-    //#endif
 }
 
 void CBackend::OnFrameBegin()
 {
-//#ifndef DEDICATED_SERVER
-#ifndef _EDITOR
     if (!GEnv.isDedicatedServer)
-#endif
     {
         PGO(Msg("PGO:*****frame[%d]*****", RDEVICE.dwFrame));
 #if defined(USE_DX10) || defined(USE_DX11)
@@ -57,7 +50,6 @@ void CBackend::OnFrameBegin()
         Index.Flush();
         set_Stencil(FALSE);
     }
-    //#endif
 }
 
 void CBackend::Invalidate()

diff --git a/src/Layers/xrRender/ResourceManager.cpp b/src/Layers/xrRender/ResourceManager.cpp
@@ -268,56 +268,33 @@ Shader* CResourceManager::_cpp_Create(
 
 Shader* CResourceManager::_cpp_Create(LPCSTR s_shader, LPCSTR s_textures, LPCSTR s_constants, LPCSTR s_matrices)
 {
-//#ifndef DEDICATED_SERVER
-#ifndef _EDITOR
     if (!GEnv.isDedicatedServer)
-#endif
     {
 //	TODO: DX10: When all shaders are ready switch to common path
 #if defined(USE_DX10) || defined(USE_DX11)
         IBlender* pBlender = _GetBlender(s_shader ? s_shader : "null");
         if (!pBlender)
-            return NULL;
+            return nullptr;
         return _cpp_Create(pBlender, s_shader, s_textures, s_constants, s_matrices);
 #else //	USE_DX10
         return _cpp_Create(_GetBlender(s_shader ? s_shader : "null"), s_shader, s_textures, s_constants, s_matrices);
 #endif //	USE_DX10
         //#else
     }
-#ifndef _EDITOR
-    else
-#endif
-    {
-        return nullptr;
-    }
-    //#endif
+    return nullptr;
 }
 
 Shader* CResourceManager::Create(IBlender* B, LPCSTR s_shader, LPCSTR s_textures, LPCSTR s_constants, LPCSTR s_matrices)
 {
-//#ifndef DEDICATED_SERVER
-#ifndef _EDITOR
-    if (!GEnv.isDedicatedServer)
-#endif
-    {
-        return _cpp_Create(B, s_shader, s_textures, s_constants, s_matrices);
-        //#else
-    }
-#ifndef _EDITOR
-    else
-#endif
-    {
+    if (GEnv.isDedicatedServer)
         return nullptr;
-        //#endif
-    }
+
+    return _cpp_Create(B, s_shader, s_textures, s_constants, s_matrices);
 }
 
 Shader* CResourceManager::Create(LPCSTR s_shader, LPCSTR s_textures, LPCSTR s_constants, LPCSTR s_matrices)
 {
-//#ifndef DEDICATED_SERVER
-#ifndef _EDITOR
     if (!GEnv.isDedicatedServer)
-#endif
     {
 //	TODO: DX10: When all shaders are ready switch to common path
 #if defined(USE_DX10) || defined(USE_DX11)
@@ -348,14 +325,7 @@ Shader* CResourceManager::Create(LPCSTR s_shader, LPCSTR s_textures, LPCSTR s_co
             return _cpp_Create(s_shader, s_textures, s_constants, s_matrices);
 #endif //	USE_DX10
     }
-//#else
-#ifndef _EDITOR
-    else
-#endif
-    {
-        return nullptr;
-    }
-    //#endif
+    return nullptr;
 }
 
 void CResourceManager::Delete(const Shader* S)

diff --git a/src/Layers/xrRender/SH_Texture.cpp b/src/Layers/xrRender/SH_Texture.cpp
@@ -167,10 +167,7 @@ void CTexture::Load()
     }
 
     Preload();
-//#ifndef		DEDICATED_SERVER
-#ifndef _EDITOR
     if (!GEnv.isDedicatedServer)
-#endif
     {
         // Check for OGM
         string_path fn;
@@ -286,7 +283,6 @@ void CTexture::Load()
                 flags.MemoryUsage = mem;
             }
         }
-        //#endif
     }
     PostLoad();
 }