Move xrRender_R4 and xrRender_GL to separate namespaces

Author: Xottab-DUTY

src/Layers/xrRenderPC_GL/CMakeLists.txt

@@ -418,6 +418,7 @@ target_compile_definitions(xrRender_GL
     PRIVATE
     XRRENDER_GL_EXPORTS
     USE_OGL
+    RENDER_NAMESPACE=render_gl
     PURE_DYNAMIC_CAST
 )
 

src/Layers/xrRenderPC_GL/stdafx.h

@@ -18,6 +18,13 @@
 #include <SDL_opengl.h>
 #include <SDL_opengl_glext.h>
 
+#define R_GL 0
+#define R_R1 1
+#define R_R2 2
+#define R_R3 3
+#define R_R4 4
+#define RENDER R_GL
+
 #include "Layers/xrRenderGL/CommonTypes.h"
 
 #include "Layers/xrRenderGL/glHW.h"
@@ -31,13 +38,6 @@
 #include "Layers/xrRender/Blender.h"
 #include "Layers/xrRender/Blender_CLSID.h"
 
-#define R_GL 0
-#define R_R1 1
-#define R_R2 2
-#define R_R3 3
-#define R_R4 4
-#define RENDER R_GL
-
 #include "Common/_d3d_extensions.h"
 
 #include "Layers/xrRender/ResourceManager.h"

src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj

@@ -26,7 +26,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)Layers\xrRender_R2;$(xrSdkDir)include\DirectXMesh;$(xrExternals)imgui;$(xrExternals)OpenAutomate\inc;$(xrExternals)gli;$(xrExternals)gli\external;$(xrExternals)AGS_SDK;$(xrExternals)glslang\glslang\Public;$(xrExternals)sse2neon\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;RENDER_NAMESPACE=render_gl;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions Condition="'$(EnableUnitySupport)'=='true'">/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>

src/Layers/xrRenderPC_R4/stdafx.h

@@ -35,6 +35,13 @@
 
 #include <tracy/TracyD3D11.hpp>
 
+#define R_GL 0
+#define R_R1 1
+#define R_R2 2
+#define R_R3 3
+#define R_R4 4
+#define RENDER R_R4
+
 #include "Layers/xrRenderDX11/CommonTypes.h"
 
 #include "Layers/xrRenderDX11/dx11HW.h"
@@ -47,13 +54,6 @@
 #include "Layers/xrRender/Blender.h"
 #include "Layers/xrRender/Blender_CLSID.h"
 
-#define R_GL 0
-#define R_R1 1
-#define R_R2 2
-#define R_R3 3
-#define R_R4 4
-#define RENDER R_R4
-
 #include "Common/_d3d_extensions.h"
 
 #include "Layers/xrRender/ResourceManager.h"

src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj

@@ -26,7 +26,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)Layers\xrRender_R2;$(xrExternals)imgui;$(xrExternals)OpenAutomate\inc;$(xrSdkDir)include\nvapi;$(xrSdkDir)include\DirectXMesh;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_USRDLL;XRRENDER_R4_EXPORTS;USE_DX11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_USRDLL;XRRENDER_R4_EXPORTS;USE_DX11;RENDER_NAMESPACE=render_r4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions Condition="'$(EnableUnitySupport)'=='true'">/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>

src/xrEngine/Environment.h

@@ -26,10 +26,17 @@ struct SThunderboltDesc;
 struct SThunderboltCollection;
 class CLensFlareDescriptor;
 
-namespace xray::render::RENDER_NAMESPACE
+namespace xray::render
+{
+namespace render_r4
+{
+class dxEnvironmentRender;
+}
+namespace render_gl
 {
 class dxEnvironmentRender;
 }
+} // namespace xray::render
 
 #define DAY_LENGTH 86400.f
 
@@ -231,7 +238,8 @@ class ENGINE_API CEnvDescriptorMixer : public CEnvDescriptor
 
 class ENGINE_API CEnvironment : public xray::editor::ide_tool
 {
-    friend class xray::render::RENDER_NAMESPACE::dxEnvironmentRender;
+    friend class xray::render::render_r4::dxEnvironmentRender;
+    friend class xray::render::render_gl::dxEnvironmentRender;
 
     struct str_pred
     {

src/xrEngine/GameFont.h

@@ -7,16 +7,24 @@
 #include "xrCore/xrstring.h"
 #endif
 
-namespace xray::render::RENDER_NAMESPACE
+namespace xray::render
+{
+namespace render_r4
+{
+class dxFontRender;
+}
+namespace render_gl
 {
 class dxFontRender;
 }
+} // namespace xray::render
 
 class IFontRender;
 
 class ENGINE_API CGameFont : public IGameFont
 {
-    friend class xray::render::RENDER_NAMESPACE::dxFontRender;
+    friend class xray::render::render_r4::dxFontRender;
+    friend class xray::render::render_gl::dxFontRender;
 
 private:
     struct String

src/xrEngine/Rain.h

@@ -14,14 +14,22 @@
 // refs
 class ENGINE_API IRender_DetailModel;
 
-namespace xray::render::RENDER_NAMESPACE
+namespace xray::render
+{
+namespace render_r4
+{
+class dxRainRender;
+}
+namespace render_gl
 {
 class dxRainRender;
 }
+} // namespace xray::render
 
 class ENGINE_API CEffect_Rain
 {
-    friend class xray::render::RENDER_NAMESPACE::dxRainRender;
+    friend class xray::render::render_r4::dxRainRender;
+    friend class xray::render::render_gl::dxRainRender;
 
 private:
     struct Item

src/xrEngine/StatGraph.h

@@ -6,15 +6,23 @@
 #include "Include/xrRender/StatGraphRender.h"
 #include "xrCommon/xr_deque.h"
 
-namespace xray::render::RENDER_NAMESPACE
+namespace xray::render
+{
+namespace render_r4
+{
+class dxStatGraphRender;
+}
+namespace render_gl
 {
 class dxStatGraphRender;
 }
+} // namespace xray::render
 
 //---------------------------------------------------------------------------
 class ENGINE_API CStatGraph : public pureRender
 {
-    friend class xray::render::RENDER_NAMESPACE::dxStatGraphRender;
+    friend class xray::render::render_r4::dxStatGraphRender;
+    friend class xray::render::render_gl::dxStatGraphRender;
 
 public:
     enum EStyle

src/xrEngine/thunderbolt.h

@@ -14,10 +14,17 @@ class ENGINE_API IRender_DetailModel;
 class ENGINE_API CLAItem;
 class ENGINE_API CEnvDescriptorMixer;
 
-namespace xray::render::RENDER_NAMESPACE
+namespace xray::render
+{
+namespace render_r4
+{
+class dxThunderboltRender;
+}
+namespace render_gl
 {
 class dxThunderboltRender;
 }
+} // namespace xray::render
 
 struct ENGINE_API SThunderboltDesc
 {
@@ -78,7 +85,8 @@ struct ENGINE_API SThunderboltCollection
 //
 class ENGINE_API CEffect_Thunderbolt
 {
-    friend class xray::render::RENDER_NAMESPACE::dxThunderboltRender;
+    friend class xray::render::render_r4::dxThunderboltRender;
+    friend class xray::render::render_gl::dxThunderboltRender;
 
 protected:
     xr_vector<SThunderboltCollection*> collections;