#5893: For now we're rendering without vertex colours. Fix client sta…

…te flags in LightInteractions passes
codereader · Jan 28, 2022 · c151711 · c151711
1 parent 9f0439c
commit c151711
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/radiantcore/rendersystem/OpenGLRenderSystem.cpp b/radiantcore/rendersystem/OpenGLRenderSystem.cpp
@@ -326,6 +326,9 @@ IRenderResult::Ptr OpenGLRenderSystem::renderLitScene(RenderStateFlags globalFla
             entity->foreachSurfaceTouchingBounds(lightBounds,
                 [&](const render::IRenderableSurface::Ptr& surface, const ShaderPtr& shader)
             {
+                // Skip empty surfaces
+                if (surface->getIndices().empty()) return;
+
                 auto glShader = static_cast<OpenGLShader*>(shader.get());
 
                 // We only consider materials designated for camera rendering

diff --git a/radiantcore/rendersystem/backend/LightInteractions.cpp b/radiantcore/rendersystem/backend/LightInteractions.cpp
@@ -28,7 +28,6 @@ inline void submitSurface(IRenderableSurface& surface)
     const auto& indices = surface.getIndices();
 
     glVertexPointer(3, GL_DOUBLE, sizeof(ArbitraryMeshVertex), &vertices.front().vertex);
-    glColorPointer(4, GL_DOUBLE, sizeof(ArbitraryMeshVertex), &vertices.front().colour);
 
     glVertexAttribPointer(ATTR_NORMAL, 3, GL_DOUBLE, 0, sizeof(ArbitraryMeshVertex), &vertices.front().normal);
     glVertexAttribPointer(ATTR_TEXCOORD, 2, GL_DOUBLE, 0, sizeof(ArbitraryMeshVertex), &vertices.front().texcoord);
@@ -57,10 +56,10 @@ void LightInteractions::fillDepthBuffer(OpenGLState& state, RenderStateFlags glo
     const IRenderView& view, std::size_t renderTime)
 {
     glEnableClientState(GL_VERTEX_ARRAY);
-    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    glEnableClientState(GL_NORMAL_ARRAY);
-    // Render surfaces without any vertex colours(?)
+
     glDisableClientState(GL_COLOR_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+    glDisableClientState(GL_NORMAL_ARRAY);
 
     for (auto& pair : _surfacesByEntity)
     {
@@ -97,18 +96,15 @@ void LightInteractions::fillDepthBuffer(OpenGLState& state, RenderStateFlags glo
     }
 
     glDisableClientState(GL_VERTEX_ARRAY);
-    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-    glDisableClientState(GL_NORMAL_ARRAY);
 }
 
 void LightInteractions::render(OpenGLState& state, RenderStateFlags globalFlagsMask, const IRenderView& view, std::size_t renderTime)
 {
     glEnableClientState(GL_VERTEX_ARRAY);
-    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    glEnableClientState(GL_NORMAL_ARRAY);
 
-    // Render surfaces without any vertex colours(?)
     glDisableClientState(GL_COLOR_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+    glDisableClientState(GL_NORMAL_ARRAY);
 
     for (auto& pair : _surfacesByEntity)
     {
@@ -149,8 +145,6 @@ void LightInteractions::render(OpenGLState& state, RenderStateFlags globalFlagsM
     }
 
     glDisableClientState(GL_VERTEX_ARRAY);
-    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-    glDisableClientState(GL_NORMAL_ARRAY);
 }
 
 }