#5912: Move matrix uniform adapter to base class

codereader · Mar 12, 2022 · 0196387 · 0196387
1 parent 51ab0ed
commit 0196387
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/radiantcore/rendersystem/backend/glprogram/GLSLBumpProgram.cpp b/radiantcore/rendersystem/backend/glprogram/GLSLBumpProgram.cpp
@@ -189,14 +189,7 @@ void GLSLBumpProgram::applyRenderParams(const Vector3& viewer,
 
 void GLSLBumpProgram::setObjectTransform(const Matrix4& transform)
 {
-    float values[16];
-
-    for (auto i = 0; i < 16; ++i)
-    {
-        values[i] = static_cast<float>(transform[i]);
-    }
-
-    glUniformMatrix4fv(_locObjectTransform, 1, GL_FALSE, values);
+    loadMatrixUniform(_locObjectTransform, transform);
 }
 
 }

diff --git a/radiantcore/rendersystem/backend/glprogram/GLSLDepthFillAlphaProgram.cpp b/radiantcore/rendersystem/backend/glprogram/GLSLDepthFillAlphaProgram.cpp
@@ -75,14 +75,7 @@ void GLSLDepthFillAlphaProgram::applyAlphaTest(float alphaTest)
 
 void GLSLDepthFillAlphaProgram::setObjectTransform(const Matrix4& transform)
 {
-    float values[16];
-
-    for (auto i = 0; i < 16; ++i)
-    {
-        values[i] = static_cast<float>(transform[i]);
-    }
-
-    glUniformMatrix4fv(_locObjectTransform, 1, GL_FALSE, values);
+    loadMatrixUniform(_locObjectTransform, transform);
 }
 
 }

diff --git a/radiantcore/rendersystem/backend/glprogram/GLSLProgramBase.cpp b/radiantcore/rendersystem/backend/glprogram/GLSLProgramBase.cpp
@@ -1,6 +1,5 @@
 #include "GLSLProgramBase.h"
 
-#include "itextstream.h"
 #include "debugging/gl.h"
 
 namespace render
@@ -31,4 +30,16 @@ void GLSLProgramBase::disable()
     debug::assertNoGlErrors();
 }
 
+void GLSLProgramBase::loadMatrixUniform(GLuint location, const Matrix4& matrix)
+{
+    float values[16];
+
+    for (auto i = 0; i < 16; ++i)
+    {
+        values[i] = static_cast<float>(matrix[i]);
+    }
+
+    glUniformMatrix4fv(location, 1, GL_FALSE, values);
+}
+
 }
diff --git a/radiantcore/rendersystem/backend/glprogram/GLSLProgramBase.h b/radiantcore/rendersystem/backend/glprogram/GLSLProgramBase.h
@@ -22,6 +22,9 @@ class GLSLProgramBase :
     virtual void destroy() override;
     virtual void enable() override;
     virtual void disable() override;
+
+protected:
+    void loadMatrixUniform(GLuint location, const Matrix4& matrix);
 };
 
 }