#5909: Set the alpha test value as evaluated in the material's shader…

… stage. Remove texture matrix code.
codereader · Mar 13, 2022 · 9a07cf2 · 9a07cf2
1 parent 05bcddd
commit 9a07cf2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 39 deletions.
diff --git a/radiantcore/rendersystem/backend/DepthFillPass.cpp b/radiantcore/rendersystem/backend/DepthFillPass.cpp
@@ -34,24 +34,4 @@ DepthFillPass::DepthFillPass(OpenGLShader& owner, OpenGLRenderSystem& renderSyst
     assert(dynamic_cast<GLSLDepthFillAlphaProgram*>(_glState.glProgram));
 }
 
-#if 0
-void DepthFillPass::activateShaderProgram(OpenGLState& current)
-{
-    // We need a program, it is set up in the constructor
-    assert(_glState.glProgram);
-
-    // Let the base class enable the program
-    OpenGLShaderPass::activateShaderProgram(current);
-
-#if 0 // TODO: Migrate to LightInteractions::depthFill
-    auto zFillAlphaProgram = static_cast<GLSLDepthFillAlphaProgram*>(current.glProgram);
-
-    zFillAlphaProgram->applyAlphaTest(_glState.alphaThreshold);
-
-    setTextureState(current.texture0, _glState.texture0, GL_TEXTURE0, GL_TEXTURE_2D);
-    setupTextureMatrix(GL_TEXTURE0, _glState.stage0);
-#endif
-}
-#endif
-
 }
diff --git a/radiantcore/rendersystem/backend/DepthFillPass.h b/radiantcore/rendersystem/backend/DepthFillPass.h
@@ -22,11 +22,6 @@ class DepthFillPass :
     {
         return *static_cast<GLSLDepthFillAlphaProgram*>(_glState.glProgram);
     }
-
-#if 0
-protected:
-    virtual void activateShaderProgram(OpenGLState& current) override;
-#endif
 };
 
 }
diff --git a/radiantcore/rendersystem/backend/LightInteractions.cpp b/radiantcore/rendersystem/backend/LightInteractions.cpp
@@ -75,12 +75,18 @@ void LightInteractions::fillDepthBuffer(OpenGLState& state, RenderStateFlags glo
             {
                 continue;
             }
-
+
+            // Evaluate the shader stages of this material
+            depthFillPass->evaluateShaderStages(renderTime, entity);
+
             // Apply our state to the current state object
-            depthFillPass->evaluateStagesAndApplyState(state, globalFlagsMask, renderTime, entity);
+            depthFillPass->applyState(state, globalFlagsMask);
 
             auto depthFillProgram = depthFillPass->getDepthFillProgram();
 
+            // Apply the evaluated alpha test value
+            depthFillProgram.setAlphaTest(state.alphaThreshold);
+
             // Set the modelview and projection matrix
             depthFillProgram.setModelViewProjection(view.GetViewProjection());
 

diff --git a/radiantcore/rendersystem/backend/glprogram/GLSLDepthFillAlphaProgram.cpp b/radiantcore/rendersystem/backend/glprogram/GLSLDepthFillAlphaProgram.cpp
@@ -61,19 +61,9 @@ void GLSLDepthFillAlphaProgram::disable()
     glDisableVertexAttribArray(GLProgramAttribute::TexCoord);
 }
 
-void GLSLDepthFillAlphaProgram::applyAlphaTest(float alphaTest)
+void GLSLDepthFillAlphaProgram::setAlphaTest(float alphaTest)
 {
     glUniform1f(_locAlphaTest, alphaTest);
-
-    debug::assertNoGlErrors();
-
-    glActiveTexture(GL_TEXTURE0);
-    glClientActiveTexture(GL_TEXTURE0);
-
-    glMatrixMode(GL_TEXTURE);
-    glLoadIdentity();
-
-    debug::assertNoGlErrors();
 }
 
 void GLSLDepthFillAlphaProgram::setModelViewProjection(const Matrix4& modelViewProjection)

diff --git a/radiantcore/rendersystem/backend/glprogram/GLSLDepthFillAlphaProgram.h b/radiantcore/rendersystem/backend/glprogram/GLSLDepthFillAlphaProgram.h
@@ -23,7 +23,7 @@ class GLSLDepthFillAlphaProgram :
     void setObjectTransform(const Matrix4& transform);
     void setDiffuseTextureTransform(const Matrix4& transform);
 
-    void applyAlphaTest(float alphaTest);
+    void setAlphaTest(float alphaTest);
 };
 
 }