From 916cc082284868ee953ae227f47d9f633976f8c1 Mon Sep 17 00:00:00 2001 From: codereader Date: Fri, 25 Feb 2022 14:45:17 +0100 Subject: [PATCH] #5893: Remove unused locals --- .../rendersystem/backend/LightInteractions.cpp | 14 ++------------ .../rendersystem/backend/LightingModeRenderer.cpp | 2 -- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/radiantcore/rendersystem/backend/LightInteractions.cpp b/radiantcore/rendersystem/backend/LightInteractions.cpp index 6dfbbd7019..29cd9e662a 100644 --- a/radiantcore/rendersystem/backend/LightInteractions.cpp +++ b/radiantcore/rendersystem/backend/LightInteractions.cpp @@ -85,8 +85,6 @@ void LightInteractions::fillDepthBuffer(OpenGLState& state, RenderStateFlags glo // Apply our state to the current state object shader->getDepthFillPass()->applyState(state, globalFlagsMask, view.getViewer(), renderTime, entity); - RenderInfo info(state.getRenderFlags(), view.getViewer(), state.cubeMapMode); - for (auto object : objectList) { ObjectRenderer::SubmitObject(object.get(), _store); @@ -109,25 +107,17 @@ void LightInteractions::render(OpenGLState& state, RenderStateFlags globalFlagsM for (auto& pair : pair.second) { auto shader = pair.first; - auto& objectList = pair.second; if (!shader->isVisible()) continue; auto pass = shader->getInteractionPass(); - if (pass) + if (pass && pass->stateIsActive()) { - if (!pass->stateIsActive()) - { - continue; - } - // Apply our state to the current state object pass->applyState(state, globalFlagsMask, view.getViewer(), renderTime, entity); - RenderInfo info(state.getRenderFlags(), view.getViewer(), state.cubeMapMode); - - for (auto object : objectList) + for (auto object : pair.second) { if (state.glProgram) { diff --git a/radiantcore/rendersystem/backend/LightingModeRenderer.cpp b/radiantcore/rendersystem/backend/LightingModeRenderer.cpp index 5d94f369c9..30e280c73a 100644 --- a/radiantcore/rendersystem/backend/LightingModeRenderer.cpp +++ b/radiantcore/rendersystem/backend/LightingModeRenderer.cpp @@ -97,8 +97,6 @@ IRenderResult::Ptr LightingModeRenderer::render(RenderStateFlags globalFlagsMask // Apply our state to the current state object pass.applyState(current, globalFlagsMask, view.getViewer(), time, entity.get()); - RenderInfo info(current.getRenderFlags(), view.getViewer(), current.cubeMapMode); - if (current.glProgram) { OpenGLShaderPass::SetUpNonInteractionProgram(current, view.getViewer(), object->getObjectTransform());