Refactor renderers loading system

Engine anyway loads all 4 renderers and hold them in memory..
OpenXRay · Jan 9, 2018 · d533f5b · d533f5b
1 parent 71181ab
commit d533f5b
Show file tree

Hide file tree

Showing 7 changed files with 161 additions and 96 deletions.
diff --git a/src/Include/xrAPI/xrAPI.h b/src/Include/xrAPI/xrAPI.h
@@ -14,6 +14,8 @@ class ISoundManager;
 
 class XRAPI_API EngineGlobalEnvironment
 {
+    using SupportCheck = bool(*)();
+    using SetupEnv = void(*)();
 public:
 #ifdef _EDITOR
     CRender* Render;
@@ -31,6 +33,15 @@ class XRAPI_API EngineGlobalEnvironment
     ISoundManager* Sound;
 
     bool isDedicatedServer;
+
+    SupportCheck CheckR2;
+    SupportCheck CheckR3;
+    SupportCheck CheckR4;
+    SetupEnv SetupR1;
+    SetupEnv SetupR2;
+    SetupEnv SetupR3;
+    SetupEnv SetupR4;
+    SetupEnv SetupCurrentRenderer;
 };
 
 extern XRAPI_API EngineGlobalEnvironment GEnv;
diff --git a/src/Layers/xrRenderPC_R1/xrRender_R1.cpp b/src/Layers/xrRenderPC_R1/xrRender_R1.cpp
@@ -5,7 +5,7 @@
 
 #pragma comment(lib, "xrEngine.lib")
 
-extern "C" void XR_EXPORT SetupEnv()
+void SetupEnvR1()
 {
     GEnv.Render = &RImplementation;
     GEnv.RenderFactory = &RenderFactoryImpl;
@@ -14,5 +14,18 @@ extern "C" void XR_EXPORT SetupEnv()
 #ifdef DEBUG
     GEnv.DRender = &DebugRenderImpl;
 #endif
-    xrRender_initconsole(); // XXX: Xottab_DUTY: move somewhere
+    xrRender_initconsole();
 }
+
+// This must not be optimized by compiler
+#pragma optimize("", off)
+static const volatile class GEnvHelper
+{
+public:
+    GEnvHelper()
+    {
+        GEnv.SetupR1 = SetupEnvR1;
+    }
+} helper;
+#pragma optimize("", on)
+
diff --git a/src/Layers/xrRenderPC_R2/xrRender_R2.cpp b/src/Layers/xrRenderPC_R2/xrRender_R2.cpp
@@ -5,7 +5,7 @@
 
 #pragma comment(lib, "xrEngine.lib")
 
-extern "C" void XR_EXPORT SetupEnv()
+void SetupEnvR2()
 {
     GEnv.Render = &RImplementation;
     GEnv.RenderFactory = &RenderFactoryImpl;
@@ -14,10 +14,10 @@ extern "C" void XR_EXPORT SetupEnv()
 #ifdef DEBUG
     GEnv.DRender = &DebugRenderImpl;
 #endif
-    xrRender_initconsole(); // XXX: Xottab_DUTY: move somewhere
+    xrRender_initconsole();
 }
 
-extern "C" bool XR_EXPORT SupportsAdvancedRendering()
+bool SupportsAdvancedRendering()
 {
     D3DCAPS9 caps;
     CHW _HW;
@@ -31,3 +31,16 @@ extern "C" bool XR_EXPORT SupportsAdvancedRendering()
     else
         return true;
 }
+
+// This must not be optimized by compiler
+#pragma optimize("", off)
+static const volatile class GEnvHelper
+{
+public:
+    GEnvHelper()
+    {
+        GEnv.CheckR2 = SupportsAdvancedRendering;
+        GEnv.SetupR2 = SetupEnvR2;
+    }
+} helper;
+#pragma optimize("", on)
diff --git a/src/Layers/xrRenderPC_R3/xrRender_R3.cpp b/src/Layers/xrRenderPC_R3/xrRender_R3.cpp
@@ -5,7 +5,7 @@
 
 #pragma comment(lib, "xrEngine.lib")
 
-extern "C" void XR_EXPORT SetupEnv()
+void SetupEnvR3()
 {
     GEnv.Render = &RImplementation;
     GEnv.RenderFactory = &RenderFactoryImpl;
@@ -14,10 +14,10 @@ extern "C" void XR_EXPORT SetupEnv()
 #ifdef DEBUG
     GEnv.DRender = &DebugRenderImpl;
 #endif
-    xrRender_initconsole(); // XXX: Xottab_DUTY: move somewhere
+    xrRender_initconsole();
 }
 
-extern "C" bool XR_EXPORT SupportsDX10Rendering()
+bool SupportsDX10Rendering()
 {
     return xrRender_test_hw() ? true : false;
     /*
@@ -34,3 +34,16 @@ extern "C" bool XR_EXPORT SupportsDX10Rendering()
         return true;
     */
 }
+
+// This must not be optimized by compiler
+#pragma optimize("", off)
+static const volatile class GEnvHelper
+{
+public:
+    GEnvHelper()
+    {
+        GEnv.CheckR3 = SupportsDX10Rendering;
+        GEnv.SetupR3 = SetupEnvR3;
+    }
+} helper;
+#pragma optimize("", on)
diff --git a/src/Layers/xrRenderPC_R4/xrRender_R4.cpp b/src/Layers/xrRenderPC_R4/xrRender_R4.cpp
@@ -2,10 +2,11 @@
 #include "Layers/xrRender/dxRenderFactory.h"
 #include "Layers/xrRender/dxUIRender.h"
 #include "Layers/xrRender/dxDebugRender.h"
+#include "Include/xrAPI/xrAPI.h"
 
 #pragma comment(lib, "xrEngine.lib")
 
-extern "C" void XR_EXPORT SetupEnv()
+void SetupEnvR4()
 {
     GEnv.Render = &RImplementation;
     GEnv.RenderFactory = &RenderFactoryImpl;
@@ -14,10 +15,10 @@ extern "C" void XR_EXPORT SetupEnv()
 #ifdef DEBUG
     GEnv.DRender = &DebugRenderImpl;
 #endif
-    xrRender_initconsole(); // XXX: Xottab_DUTY: move somewhere
+    xrRender_initconsole();
 }
 
-extern "C" bool XR_EXPORT SupportsDX11Rendering()
+bool SupportsDX11Rendering()
 {
     return xrRender_test_hw() ? true : false;
     /*
@@ -34,3 +35,16 @@ extern "C" bool XR_EXPORT SupportsDX11Rendering()
         return true;
     */
 }
+
+// This must not be optimized by compiler
+#pragma optimize("", off)
+static const volatile class GEnvHelper
+{
+public:
+    GEnvHelper()
+    {
+        GEnv.CheckR4 = SupportsDX11Rendering;
+        GEnv.SetupR4 = SetupEnvR4;
+    }
+} helper;
+#pragma optimize("", on)