#5909: Move OpenGLState type to rendersystem backend, it's not a publ…

…ic interface and only used internally by the renderer.
codereader · Mar 13, 2022 · 9333b5b · 9333b5b
1 parent ac47e37
commit 9333b5b
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 12 deletions.
diff --git a/include/precompiled_render_interfaces.h b/include/precompiled_render_interfaces.h
@@ -11,4 +11,3 @@
 #include "irendersystemfactory.h"
 #include "igl.h"
 #include "iglprogram.h"
-#include "iglrender.h"
diff --git a/radiantcore/rendersystem/backend/GLProgramFactory.h b/radiantcore/rendersystem/backend/GLProgramFactory.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "iglrender.h"
-
 #include <map>
 #include <memory>
+#include "igl.h"
 
 namespace render
 {

diff --git a/radiantcore/rendersystem/backend/LightInteractions.h b/radiantcore/rendersystem/backend/LightInteractions.h
@@ -11,6 +11,7 @@
 namespace render
 {
 
+class OpenGLState;
 class OpenGLShader;
 
 /**

diff --git a/radiantcore/rendersystem/backend/LightingModeRenderer.cpp b/radiantcore/rendersystem/backend/LightingModeRenderer.cpp
@@ -5,6 +5,7 @@
 #include "OpenGLShaderPass.h"
 #include "OpenGLShader.h"
 #include "ObjectRenderer.h"
+#include "OpenGLState.h"
 
 namespace render
 {

diff --git a/radiantcore/rendersystem/backend/OpenGLShaderPass.h b/radiantcore/rendersystem/backend/OpenGLShaderPass.h
@@ -2,7 +2,7 @@
 
 #include "math/Vector3.h"
 #include "math/Matrix4.h"
-#include "iglrender.h"
+#include "OpenGLState.h"
 
 #include <vector>
 #include <map>

diff --git a/include/iglrender.h → ...ntcore/rendersystem/backend/OpenGLState.h b/include/iglrender.h → ...ntcore/rendersystem/backend/OpenGLState.h
@@ -1,17 +1,17 @@
 #pragma once
 
 #include "igl.h"
-#include "imodule.h"
 #include "ishaders.h"
 #include "ishaderlayer.h"
 
-#include "math/Vector4.h"
-
-#include <vector>
+#include "render/Colour4.h"
 
 // Full declaration in iglprogram.h
 class GLProgram;
 
+namespace render
+{
+
 /**
  * \brief
  * Data structure encapsulating various parameters of the OpenGL state machine,
@@ -241,7 +241,9 @@ class OpenGLState
       m_pointsize(1),
       m_linestipple_factor(1),
       m_linestipple_pattern(0xAAAA),
-      glProgram(NULL),
+      glProgram(nullptr),
       cubeMapMode(IShaderLayer::CUBE_MAP_NONE)
     { }
 };
+
+}
diff --git a/radiantcore/rendersystem/backend/OpenGLStateLess.h b/radiantcore/rendersystem/backend/OpenGLStateLess.h
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "iglrender.h"
+#include "OpenGLState.h"
+
+namespace render
+{
 
 /**
  * Comparison class for OpenGLState objects.
@@ -36,3 +39,5 @@ struct OpenGLStateLess
 	  return self < other;
     }
 };
+
+}
diff --git a/radiantcore/rendersystem/backend/SceneRenderer.cpp b/radiantcore/rendersystem/backend/SceneRenderer.cpp
@@ -1,7 +1,7 @@
 #include "SceneRenderer.h"
 
 #include "igl.h"
-#include "iglrender.h"
+#include "OpenGLState.h"
 
 namespace render
 {

diff --git a/radiantcore/rendersystem/backend/SceneRenderer.h b/radiantcore/rendersystem/backend/SceneRenderer.h
@@ -1,10 +1,11 @@
 #pragma once
 
-class OpenGLState;
+#include "irender.h"
 
 namespace render
 {
 
+class OpenGLState;
 class IRenderView;
 
 /**

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -1010,6 +1010,7 @@
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\ObjectRenderer.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\OpenGLShader.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\OpenGLShaderPass.h" />
+    <ClInclude Include="..\..\radiantcore\rendersystem\backend\OpenGLState.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\OpenGLStateLess.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\OpenGLStateManager.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\SceneRenderer.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -2355,5 +2355,8 @@
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\BufferObjectProvider.h">
       <Filter>src\rendersystem\backend</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\rendersystem\backend\OpenGLState.h">
+      <Filter>src\rendersystem\backend</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>