#5893: Cut off redundant calculations

codereader · Jan 28, 2022 · 71b3f66 · 71b3f66
1 parent 58e1122
commit 71b3f66
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/radiantcore/rendersystem/backend/LightInteractions.cpp b/radiantcore/rendersystem/backend/LightInteractions.cpp
@@ -120,6 +120,11 @@ void LightInteractions::render(OpenGLState& state, RenderStateFlags globalFlagsM
 
             shader->foreachPassWithoutDepthPass([&](OpenGLShaderPass& pass)
             {
+                if (!pass.stateIsActive())
+                {
+                    return;
+                }
+
                 // Reset the texture matrix
                 glMatrixMode(GL_TEXTURE);
                 glLoadMatrixd(Matrix4::getIdentity());
@@ -135,7 +140,7 @@ void LightInteractions::render(OpenGLState& state, RenderStateFlags globalFlagsM
                 {
                     if (state.glProgram)
                     {
-                        OpenGLShaderPass::setUpLightingCalculation(state, &_light,
+                        OpenGLShaderPass::setUpLightingCalculation(state, &_light, _worldToLight,
                             view.getViewer(), surface.get().getSurfaceTransform(), renderTime, state.isColourInverted());
                     }
 

diff --git a/radiantcore/rendersystem/backend/LightInteractions.h b/radiantcore/rendersystem/backend/LightInteractions.h
@@ -22,6 +22,7 @@ class LightInteractions
 {
 private:
     RendererLight& _light;
+    Matrix4 _worldToLight;
 
     // A flat list of surfaces
     using SurfaceList = std::vector<std::reference_wrapper<IRenderableSurface>>;
@@ -37,6 +38,7 @@ class LightInteractions
 public:
     LightInteractions(RendererLight& light) :
         _light(light),
+        _worldToLight(light.getLightTextureTransformation()),
         _drawCalls(0)
     {}
 

diff --git a/radiantcore/rendersystem/backend/OpenGLShaderPass.cpp b/radiantcore/rendersystem/backend/OpenGLShaderPass.cpp
@@ -631,6 +631,7 @@ bool OpenGLShaderPass::stateIsActive()
 // Setup lighting
 void OpenGLShaderPass::setUpLightingCalculation(OpenGLState& current,
                                                 const RendererLight* light,
+                                                const Matrix4& worldToLight,
                                                 const Vector3& viewer,
                                                 const Matrix4& objTransform,
                                                 std::size_t time,
@@ -671,12 +672,9 @@ void OpenGLShaderPass::setUpLightingCalculation(OpenGLState& current,
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
 
-    // Get the world-space to light-space transformation matrix
-    Matrix4 world2light = light->getLightTextureTransformation();
-
     // Set the GL program parameters
     GLProgram::Params parms(
-        light->getLightOrigin(), layer->getColour(), world2light
+        light->getLightOrigin(), layer->getColour(), worldToLight
     );
     parms.isAmbientLight = lightMat->isAmbientLight();
     parms.invertVertexColour = invertVertexColour;
@@ -725,7 +723,8 @@ void OpenGLShaderPass::renderAllContained(const Renderables& renderables,
         const RendererLight* light = r.light;
         if (current.glProgram && light)
         {
-            setUpLightingCalculation(current, light, viewer, *transform, time, _glState.isColourInverted());
+            setUpLightingCalculation(current, light, light->getLightTextureTransformation(),
+                viewer, *transform, time, _glState.isColourInverted());
         }
 
         // Render the renderable

diff --git a/radiantcore/rendersystem/backend/OpenGLShaderPass.h b/radiantcore/rendersystem/backend/OpenGLShaderPass.h
@@ -72,10 +72,7 @@ class OpenGLShaderPass
 
 protected:
 
-    // Returns true if the stage associated to this pass is active and should be rendered
-	bool stateIsActive();
-
-	void setupTextureMatrix(GLenum textureUnit, const IShaderLayer::Ptr& stage);
+    void setupTextureMatrix(GLenum textureUnit, const IShaderLayer::Ptr& stage);
 
 	// Render all of the given TransformedRenderables
 	void renderAllContained(const Renderables& renderables,
@@ -113,6 +110,9 @@ class OpenGLShaderPass
 		_owner(owner)
 	{}
 
+    // Returns true if the stage associated to this pass is active and should be rendered
+    bool stateIsActive();
+
 	/**
      * \brief
      * Add a renderable to this shader pass the given object transform matrix
@@ -190,6 +190,7 @@ class OpenGLShaderPass
     // Set up lighting calculation
     static void setUpLightingCalculation(OpenGLState& current,
         const RendererLight* light,
+        const Matrix4& worldToLight,
         const Vector3& viewer,
         const Matrix4& objTransform,
         std::size_t time,