De-member some helper functions from GLProgramFactory

codereader · Mar 2, 2022 · ba4fb83 · ba4fb83
1 parent f610223
commit ba4fb83
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/radiantcore/rendersystem/backend/GLProgramFactory.cpp b/radiantcore/rendersystem/backend/GLProgramFactory.cpp
@@ -72,7 +72,7 @@ void GLProgramFactory::realise()
 }
 
 // Unrealise the program factory.
-void GLProgramFactory::unrealise() 
+void GLProgramFactory::unrealise()
 {
 	// Destroy each GLProgram in the map
     for (ProgramMap::value_type& pair : _builtInPrograms)
@@ -111,7 +111,10 @@ GLProgramFactory::getFileAsBuffer(const std::string& filename,
     return buffer;
 }
 
-void GLProgramFactory::assertShaderCompiled(GLuint shader)
+namespace
+{
+
+void assertShaderCompiled(GLuint shader)
 {
     // Get compile status
     GLint compileStatus;
@@ -136,7 +139,7 @@ void GLProgramFactory::assertShaderCompiled(GLuint shader)
     }
 }
 
-std::string GLProgramFactory::getProgramInfoLog(GLuint program)
+std::string getProgramInfoLog(GLuint program)
 {
     // Get log length
     int logLength;
@@ -151,7 +154,7 @@ std::string GLProgramFactory::getProgramInfoLog(GLuint program)
     return logStr;
 }
 
-void GLProgramFactory::assertProgramLinked(GLuint program)
+void assertProgramLinked(GLuint program)
 {
     // Check the link status
     GLint linkStatus;
@@ -183,6 +186,8 @@ void GLProgramFactory::assertProgramLinked(GLuint program)
 #endif
 }
 
+} // namespace
+
 GLuint GLProgramFactory::createGLSLProgram(const std::string& vFile,
                                            const std::string& fFile)
 {

diff --git a/radiantcore/rendersystem/backend/GLProgramFactory.h b/radiantcore/rendersystem/backend/GLProgramFactory.h
@@ -50,16 +50,6 @@ class GLProgramFactory
     static CharBufPtr getFileAsBuffer(const std::string& filename,
                                       bool nullTerminated);
 
-    // Get the program info log as a string
-    static std::string getProgramInfoLog(GLuint program);
-
-    // Check the status of a shader, and throw exception with the info log if it
-    // is not valid
-    static void assertShaderCompiled(GLuint shader);
-
-    // Check the program has linked, throwing exception if failed
-    static void assertProgramLinked(GLuint program);
-
 public:
     // Constructor, populates internal map
     GLProgramFactory();
@@ -75,9 +65,9 @@ class GLProgramFactory
     /**
      * Gets or creates the GL program for the given V/F program filenames.
      * The programs will be loaded from the game's glprogs/ folder
-     * as in the idTech4 engine. 
+     * as in the idTech4 engine.
      *
-     * The returned pointer is always non-null, on failures a 
+     * The returned pointer is always non-null, on failures a
      * std::runtime_error will be thrown.
      */
     GLProgram* getProgram(const std::string& vertexProgramFilename,

diff --git a/radiantcore/rendersystem/backend/glprogram/GLSLBumpProgram.h b/radiantcore/rendersystem/backend/glprogram/GLSLBumpProgram.h
@@ -6,7 +6,7 @@
 namespace render
 {
 
-class GLSLBumpProgram : 
+class GLSLBumpProgram :
     public GLSLProgramBase
 {
 private:
@@ -30,7 +30,7 @@ class GLSLBumpProgram :
 
     void applyRenderParams(const Vector3& viewer,
                            const Matrix4& localToWorld,
-                           const Params&);
+                           const Params&) override;
 };
 
 } // namespace render

diff --git a/radiantcore/rendersystem/backend/glprogram/GLSLCubeMapProgram.h b/radiantcore/rendersystem/backend/glprogram/GLSLCubeMapProgram.h
@@ -23,9 +23,8 @@ class GLSLCubeMapProgram :
     void enable() override;
     void disable() override;
 
-    void applyRenderParams(const Vector3& viewer,
-        const Matrix4& localToWorld,
-        const Params&);
+    void applyRenderParams(const Vector3& viewer, const Matrix4& localToWorld,
+                           const Params&) override;
 };
 
 } // namespace render