New field for GEnv: CurrentRenderer

Used instead of g_current_renderer.

Improvements for previous commits

Author: Xottab-DUTY

src/Include/xrAPI/xrAPI.h

@@ -16,24 +16,22 @@ class XRAPI_API EngineGlobalEnvironment
 {
     using SupportCheck = bool(*)();
     using SetupEnv = void(*)();
+
 public:
-#ifdef _EDITOR
-    CRender* Render;
-#else
     IRender* Render;
     IDebugRender* DRender;
     CDUInterface* DU;
     xr_token* vid_mode_token;
     IUIRender* UIRender;
     CGameMtlLibrary* PGMLib;
-#endif
     IRenderFactory* RenderFactory;
     CScriptEngine* ScriptEngine;
     AISpaceBase* AISpace;
     ISoundManager* Sound;
 
     bool isDedicatedServer;
 
+    int CurrentRenderer;
     SupportCheck CheckR2;
     SupportCheck CheckR3;
     SupportCheck CheckR4;

src/Layers/xrRender/HW.cpp

@@ -106,7 +106,7 @@ D3DFORMAT CHW::selectDepthStencil(D3DFORMAT fTarget)
 {
 // R2 hack
 #pragma todo("R2 need to specify depth format")
-    if (psDeviceFlags.test(rsR2))
+    if (GEnv.CurrentRenderer == 2)
         return D3DFMT_D24S8;
 
     // R1 usual

src/Layers/xrRender/Texture.cpp

@@ -20,7 +20,6 @@ void fix_texture_name(LPSTR fn)
     }
 }
 
-ENGINE_API int g_current_renderer;
 #ifndef _EDITOR
 ENGINE_API bool is_enough_address_space_available();
 #else
@@ -44,7 +43,7 @@ int get_texture_load_lod(LPCSTR fn)
         {
             if (psTextureLOD < 1)
             {
-                if (enough_address_space_available || (g_current_renderer < 2))
+                if (enough_address_space_available || GEnv.CurrentRenderer < 2)
                     return 0;
                 else
                     return 1;
@@ -58,7 +57,7 @@ int get_texture_load_lod(LPCSTR fn)
 
     if (psTextureLOD < 2)
     {
-        //if (enough_address_space_available || g_current_renderer<2)
+        //if (enough_address_space_available || GEnv.CurrentRenderer < 2)
         return 0;
         //else
         //    return 1;

src/Layers/xrRenderPC_R1/xrRender_R1.cpp

@@ -18,14 +18,15 @@ void SetupEnvR1()
 }
 
 // This must not be optimized by compiler
-#pragma optimize("", off)
 static const volatile class GEnvHelper
 {
 public:
     GEnvHelper()
     {
         GEnv.SetupR1 = SetupEnvR1;
     }
+    ~GEnvHelper()
+    {
+        GEnv.SetupR1 = nullptr;
+    }
 } helper;
-#pragma optimize("", on)
-

src/Layers/xrRenderPC_R2/xrRender_R2.cpp

@@ -33,7 +33,6 @@ bool SupportsAdvancedRendering()
 }
 
 // This must not be optimized by compiler
-#pragma optimize("", off)
 static const volatile class GEnvHelper
 {
 public:
@@ -42,5 +41,9 @@ static const volatile class GEnvHelper
         GEnv.CheckR2 = SupportsAdvancedRendering;
         GEnv.SetupR2 = SetupEnvR2;
     }
+    ~GEnvHelper()
+    {
+        GEnv.CheckR2 = nullptr;
+        GEnv.SetupR2 = nullptr;
+    }
 } helper;
-#pragma optimize("", on)

src/Layers/xrRenderPC_R3/xrRender_R3.cpp

@@ -36,7 +36,6 @@ bool SupportsDX10Rendering()
 }
 
 // This must not be optimized by compiler
-#pragma optimize("", off)
 static const volatile class GEnvHelper
 {
 public:
@@ -45,5 +44,9 @@ static const volatile class GEnvHelper
         GEnv.CheckR3 = SupportsDX10Rendering;
         GEnv.SetupR3 = SetupEnvR3;
     }
+    ~GEnvHelper()
+    {
+        GEnv.CheckR3 = nullptr;
+        GEnv.SetupR3 = nullptr;
+    }
 } helper;
-#pragma optimize("", on)

src/Layers/xrRenderPC_R4/xrRender_R4.cpp

@@ -37,7 +37,6 @@ bool SupportsDX11Rendering()
 }
 
 // This must not be optimized by compiler
-#pragma optimize("", off)
 static const volatile class GEnvHelper
 {
 public:
@@ -46,5 +45,9 @@ static const volatile class GEnvHelper
         GEnv.CheckR4 = SupportsDX11Rendering;
         GEnv.SetupR4 = SetupEnvR4;
     }
+    ~GEnvHelper()
+    {
+        GEnv.CheckR4 = nullptr;
+        GEnv.SetupR4 = nullptr;
+    }
 } helper;
-#pragma optimize("", on)

src/utils/xrAI/xrAI.cpp

@@ -123,8 +123,6 @@ void execute(LPSTR cmd)
 
             const auto hFactory = std::make_unique<XRay::Module>("xrSE_Factory");
 
-            if (!hFactory->exist())
-                R_CHK(GetLastError());
             R_ASSERT2(hFactory->exist(), "Factory DLL raised exception during loading or there is no factory DLL at all");
 
 #ifdef XR_X64

src/xrEngine/EngineAPI.cpp

@@ -41,7 +41,6 @@ CEngineAPI::~CEngineAPI()
 }
 
 extern u32 renderer_value; // con cmd
-ENGINE_API int g_current_renderer = 0;
 
 bool is_enough_address_space_available()
 {
@@ -54,26 +53,23 @@ void CEngineAPI::InitializeNotDedicated()
 {
     if (psDeviceFlags.test(rsR4))
     {
-        
         if (hRenderR4->exist())
         {
-            g_current_renderer = 4;
+            GEnv.CurrentRenderer = 4;
             GEnv.SetupCurrentRenderer = GEnv.SetupR4;
         }
         else
         {
             psDeviceFlags.set(rsR4, false);
             psDeviceFlags.set(rsR3, true);
         }
-            
-            
     }
 
     if (psDeviceFlags.test(rsR3))
     {
         if (hRenderR3->exist())
         {
-            g_current_renderer = 3;
+            GEnv.CurrentRenderer = 3;
             GEnv.SetupCurrentRenderer = GEnv.SetupR3;
         }
         else
@@ -85,10 +81,9 @@ void CEngineAPI::InitializeNotDedicated()
 
     if (psDeviceFlags.test(rsR2))
     {
-        
         if (hRenderR2->exist())
         {
-            g_current_renderer = 2;
+            GEnv.CurrentRenderer = 2;
             GEnv.SetupCurrentRenderer = GEnv.SetupR2;
         }
         else
@@ -105,7 +100,7 @@ void CEngineAPI::InitializeRenderers()
     {
         R_ASSERT(hRenderR1);
         renderer_value = 0; // con cmd
-        g_current_renderer = 1;
+        GEnv.CurrentRenderer = 1;
         GEnv.SetupCurrentRenderer = GEnv.SetupR1;
     }
 
@@ -117,9 +112,6 @@ void CEngineAPI::InitializeRenderers()
 void CEngineAPI::Initialize(void)
 {
     hGame = std::make_unique<XRay::Module>("xrGame");
-
-    if (!hGame->exist())
-        R_CHK(GetLastError());
     R_ASSERT2(hGame, "Game DLL raised exception during loading or there is no game DLL at all");
 
     pCreate = (Factory_Create*)hGame->getProcAddress("xrFactory_Create");

src/xrGame/Torch.cpp

@@ -28,8 +28,6 @@ static const float OPTIMIZATION_DISTANCE = 100.f;
 
 static bool stalker_use_dynamic_lights = false;
 
-ENGINE_API int g_current_renderer;
-
 CTorch::CTorch(void)
 {
     light_render = GEnv.Render->light_create();
@@ -50,7 +48,7 @@ CTorch::CTorch(void)
 
     // Disabling shift by x and z axes for 1st render,
     // because we don't have dynamic lighting in it.
-    if (g_current_renderer == 1)
+    if (GEnv.CurrentRenderer == 1)
     {
         TORCH_OFFSET.x = 0;
         TORCH_OFFSET.z = 0;