#5909: Separate state application and renderable submission

codereader · Mar 13, 2022 · 05bcddd · 05bcddd
1 parent c5680da
commit 05bcddd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git a/radiantcore/rendersystem/backend/FullBrightRenderer.cpp b/radiantcore/rendersystem/backend/FullBrightRenderer.cpp
@@ -65,7 +65,9 @@ IRenderResult::Ptr FullBrightRenderer::render(RenderStateFlags globalstate, cons
 
         if (pass->getShader().isVisible() && pass->isApplicableTo(_renderViewType))
         {
-            pass->submitSurfaces(current, globalstate, view, time);
+            // Apply our state to the current state object
+            pass->evaluateStagesAndApplyState(current, globalstate, time, nullptr);
+            pass->submitSurfaces(view);
         }
     }
 
@@ -81,7 +83,9 @@ IRenderResult::Ptr FullBrightRenderer::render(RenderStateFlags globalstate, cons
 
         if (pass->getShader().isVisible() && pass->isApplicableTo(_renderViewType))
         {
-            pass->submitRenderables(current, globalstate, time);
+            // Apply our state to the current state object
+            pass->evaluateStagesAndApplyState(current, globalstate, time, nullptr);
+            pass->submitRenderables(current);
         }
 
         pass->clearRenderables();

diff --git a/radiantcore/rendersystem/backend/OpenGLShaderPass.cpp b/radiantcore/rendersystem/backend/OpenGLShaderPass.cpp
@@ -80,23 +80,13 @@ void OpenGLShaderPass::addRenderable(const OpenGLRenderable& renderable,
     _transformedRenderables.emplace_back(renderable, modelview);
 }
 
-// Render the bucket contents
-void OpenGLShaderPass::submitSurfaces(OpenGLState& current,
-                              unsigned int flagsMask,
-                              const VolumeTest& view,
-                              std::size_t time)
+void OpenGLShaderPass::submitSurfaces(const VolumeTest& view)
 {
-    // Apply our state to the current state object
-    evaluateStagesAndApplyState(current, flagsMask, time, nullptr);
-
     _owner.drawSurfaces(view);
 }
 
-void OpenGLShaderPass::submitRenderables(OpenGLState& current, unsigned int flagsMask, std::size_t time)
+void OpenGLShaderPass::submitRenderables(OpenGLState& current)
 {
-    // Apply our state to the current state object
-    evaluateStagesAndApplyState(current, flagsMask, time, nullptr);
-
     drawRenderables(current);
 }
 

diff --git a/radiantcore/rendersystem/backend/OpenGLShaderPass.h b/radiantcore/rendersystem/backend/OpenGLShaderPass.h
@@ -101,23 +101,17 @@ class OpenGLShaderPass
 	 * \brief
      * Render the renderables attached to this shader pass.
      *
-     * \param current
-     * The current OpenGL state variables.
-     *
-     * \param flagsMask
-     * Mask of allowed render flags.
+     * \param view
+     * The render view used to cull surfaces
      */
-	void submitSurfaces(OpenGLState& current,
-                unsigned int flagsMask,
-                const VolumeTest& view,
-                std::size_t time);
+	void submitSurfaces(const VolumeTest& view);
 
     /**
      * \brief
      * Render the renderables attached to this shader pass.
      * Their geometry might not be stored in the central buffer objects.
      */
-    void submitRenderables(OpenGLState& current, unsigned int flagsMask, std::size_t time);
+    void submitRenderables(OpenGLState& current);
 
 	/**
 	 * Returns true if this shaderpass doesn't have anything to render.