SL-18869 GL 3 compatibility pass and minor decruft.

1 files changed, 0 insertions, 43 deletions

diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 364bd830f5..8b9df88fd4 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -152,7 +152,6 @@ static bool handleSetShaderChanged(const LLSD& newvalue)
         // ALM depends onto atmospheric shaders, state might have changed
         bool old_state = LLPipeline::sRenderDeferred;
         LLPipeline::refreshCachedSettings();
-        gPipeline.updateRenderDeferred();
         if (old_state != LLPipeline::sRenderDeferred)
         {
             gPipeline.releaseGLBuffers();
@@ -208,7 +207,6 @@ bool handleRenderTransparentWaterChanged(const LLSD& newvalue)
 	if (gPipeline.isInit())
 	{
 		gPipeline.updateRenderTransparentWater();
-		gPipeline.updateRenderDeferred();
 		gPipeline.releaseGLBuffers();
 		gPipeline.createGLBuffers();
 		gPipeline.resetVertexBuffers();
@@ -439,7 +437,6 @@ static bool handleReflectionProbeDetailChanged(const LLSD& newvalue)
     if (gPipeline.isInit())
     {
         LLPipeline::refreshCachedSettings();
-        gPipeline.updateRenderDeferred();
         gPipeline.releaseGLBuffers();
         gPipeline.createGLBuffers();
         gPipeline.resetVertexBuffers();
@@ -448,46 +445,6 @@ static bool handleReflectionProbeDetailChanged(const LLSD& newvalue)
     return true;
 }
 
-#if 0 // DEPRECATED
-// NOTE: may be triggered by RenderDeferred OR RenderPBR changing, don't trust "newvalue"
-static bool handleRenderDeferredChanged(const LLSD& newvalue)
-{
-    LLRenderTarget::sUseFBO = gSavedSettings.getBOOL("RenderDeferred");
-	if (gPipeline.isInit())
-	{
-		LLPipeline::refreshCachedSettings();
-		gPipeline.updateRenderDeferred();
-		gPipeline.releaseGLBuffers();
-		gPipeline.createGLBuffers();
-		gPipeline.resetVertexBuffers();
-		if (LLPipeline::sRenderDeferred == (BOOL)LLRenderTarget::sUseFBO)
-		{
-			LLViewerShaderMgr::instance()->setShaders();
-		}
-	}
-	return true;
-}
-
-// This looks a great deal like handleRenderDeferredChanged because
-// Advanced Lighting (Materials) implies bumps and shiny so disabling
-// bumps should further disable that feature.
-//
-static bool handleRenderBumpChanged(const LLSD& newval)
-{
-    LLRenderTarget::sUseFBO = newval.asBoolean() && gSavedSettings.getBOOL("RenderDeferred");
-	if (gPipeline.isInit())
-	{
-		gPipeline.updateRenderBump();
-		gPipeline.updateRenderDeferred();
-		gPipeline.releaseGLBuffers();
-		gPipeline.createGLBuffers();
-		gPipeline.resetVertexBuffers();
-		LLViewerShaderMgr::instance()->setShaders();
-	}
-	return true;
-}
-#endif
-
 static bool handleRenderDebugPipelineChanged(const LLSD& newvalue)
 {
 	gDebugPipeline = newvalue.asBoolean();