#5934: Merge constructNormalShader() method into the call site

codereader · Apr 8, 2022 · 4d37b11 · 4d37b11
1 parent 3ac2c4e
commit 4d37b11
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/radiantcore/rendersystem/backend/OpenGLShader.cpp b/radiantcore/rendersystem/backend/OpenGLShader.cpp
@@ -735,12 +735,6 @@ void OpenGLShader::appendBlendLayer(const IShaderLayer::Ptr& layer)
 #endif
 }
 
-// Construct a normal shader
-void OpenGLShader::constructNormalShader()
-{
-    constructFromMaterial(GlobalMaterialManager().getMaterial(_name));
-}
-
 void OpenGLShader::constructFromMaterial(const MaterialPtr& material)
 {
     assert(material);
@@ -782,7 +776,7 @@ void OpenGLShader::construct()
     }
 
     // Construct the shader from the material definition
-    constructNormalShader();
+    constructFromMaterial(GlobalMaterialManager().getMaterial(_name));
     enableViewType(RenderViewType::Camera);
 }
 

diff --git a/radiantcore/rendersystem/backend/OpenGLShader.h b/radiantcore/rendersystem/backend/OpenGLShader.h
@@ -67,10 +67,6 @@ class OpenGLShader :
 
 private:
 
-    // Construct shader passes from a regular shader (as opposed to a special
-    // built-in shader)
-    void constructNormalShader();
-
     void constructFromMaterial(const MaterialPtr& material);
 
     // Shader pass construction helpers