1 files changed, 5 insertions, 101 deletions

diff --git a/linden/indra/newview/llviewershadermgr.cpp b/linden/indra/newview/llviewershadermgr.cpp
index 8648271..69f7bd8 100644
--- a/linden/indra/newview/llviewershadermgr.cpp
+++ b/linden/indra/newview/llviewershadermgr.cpp
@@ -113,8 +113,6 @@ LLGLSLShader			gDeferredAvatarProgram;
 LLGLSLShader                    gDeferredAvatarAlphaProgram;
 LLGLSLShader                    gDeferredLightProgram;
 LLGLSLShader                    gDeferredMultiLightProgram;
-LLGLSLShader                    gDeferredSpotLightProgram;
-LLGLSLShader                    gDeferredMultiSpotLightProgram;
 LLGLSLShader                    gDeferredSunProgram;
 LLGLSLShader                    gDeferredBlurLightProgram;
 LLGLSLShader                    gDeferredSoftenProgram;
@@ -122,12 +120,6 @@ LLGLSLShader			gDeferredShadowProgram;
 LLGLSLShader                    gDeferredAvatarShadowProgram;
 LLGLSLShader                    gDeferredAlphaProgram;
 LLGLSLShader                    gDeferredFullbrightProgram;
-LLGLSLShader                    gDeferredGIProgram;
-LLGLSLShader                    gDeferredPostGIProgram;
-LLGLSLShader                    gDeferredPostProgram;
-
-LLGLSLShader                    gLuminanceGatherProgram;
-
 
 //current avatar shader parameter pointer
 GLint                           gAvatarMatrixParam;
@@ -159,9 +151,6 @@ LLViewerShaderMgr::LLViewerShaderMgr() :
         mShaderList.push_back(&gDeferredMultiLightProgram);
         mShaderList.push_back(&gDeferredAlphaProgram);
         mShaderList.push_back(&gDeferredFullbrightProgram);
-        mShaderList.push_back(&gDeferredPostGIProgram);
-        mShaderList.push_back(&gDeferredPostProgram);
-        mShaderList.push_back(&gDeferredGIProgram);
         mShaderList.push_back(&gDeferredWaterProgram);
         mShaderList.push_back(&gDeferredAvatarAlphaProgram);
 }
@@ -231,32 +220,13 @@ void LLViewerShaderMgr::initAttribsAndUniforms(void)
                 mReservedUniforms.push_back("shadowMap1");
                 mReservedUniforms.push_back("shadowMap2");
                 mReservedUniforms.push_back("shadowMap3");
-                mReservedUniforms.push_back("shadowMap4");
-                mReservedUniforms.push_back("shadowMap5");
-
                 mReservedUniforms.push_back("normalMap");
                 mReservedUniforms.push_back("positionMap");
                 mReservedUniforms.push_back("diffuseRect");
                 mReservedUniforms.push_back("specularRect");
                 mReservedUniforms.push_back("noiseMap");
-                mReservedUniforms.push_back("lightFunc");
                 mReservedUniforms.push_back("lightMap");
-                mReservedUniforms.push_back("luminanceMap");
-                mReservedUniforms.push_back("giLightMap");
-                mReservedUniforms.push_back("sunLightMap");
-                mReservedUniforms.push_back("localLightMap");
-                mReservedUniforms.push_back("projectionMap");
-                mReservedUniforms.push_back("diffuseGIMap");
-                mReservedUniforms.push_back("specularGIMap");
-                mReservedUniforms.push_back("normalGIMap");
-                mReservedUniforms.push_back("minpGIMap");
-                mReservedUniforms.push_back("maxpGIMap");
-                mReservedUniforms.push_back("depthGIMap");
-                mReservedUniforms.push_back("lastDiffuseGIMap");
-                mReservedUniforms.push_back("lastNormalGIMap");
-                mReservedUniforms.push_back("lastMinpGIMap");
-                mReservedUniforms.push_back("lastMaxpGIMap");
-                                        
+                        
                 mWLUniforms.push_back("camPosLocal");
 
                 mTerrainUniforms.reserve(5);
@@ -784,9 +754,9 @@ BOOL LLViewerShaderMgr::loadShadersEffects()
                 }
         }
         
-
-        // KL enabling loading of postprocess shaders until we fix
-        // ATI may still have issues
+#if 0
+        // disabling loading of postprocess shaders until we fix
+        // ATI sampler2DRect compatibility.
         
         //load Color Filter Shader
         if (success)
@@ -827,7 +797,7 @@ BOOL LLViewerShaderMgr::loadShadersEffects()
                 gPostNightVisionProgram.mShaderLevel = mVertexShaderLevel[SHADER_EFFECT];
                 success = gPostNightVisionProgram.createShader(NULL, &shaderUniforms);
         }
-        
+        #endif
 
         return success;
 
@@ -844,8 +814,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
                 gDeferredTerrainProgram.unload();
                 gDeferredLightProgram.unload();
                 gDeferredMultiLightProgram.unload();
-                gDeferredSpotLightProgram.unload();
-                gDeferredMultiSpotLightProgram.unload();
                 gDeferredSunProgram.unload();
                 gDeferredBlurLightProgram.unload();
                 gDeferredSoftenProgram.unload();
@@ -855,10 +823,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
                 gDeferredAvatarAlphaProgram.unload();
                 gDeferredAlphaProgram.unload();
                 gDeferredFullbrightProgram.unload();
-                gDeferredPostGIProgram.unload();                
-                gDeferredPostProgram.unload();          
-                gLuminanceGatherProgram.unload();
-                gDeferredGIProgram.unload();
                 gDeferredWaterProgram.unload();
                 return FALSE;
         }
@@ -929,26 +893,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
 
         if (success)
         {
-                gDeferredSpotLightProgram.mName = "Deferred SpotLight Shader";
-                gDeferredSpotLightProgram.mShaderFiles.clear();
-                gDeferredSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/pointLightV.glsl", GL_VERTEX_SHADER_ARB));
-                gDeferredSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/multiSpotLightF.glsl", GL_FRAGMENT_SHADER_ARB));
-                gDeferredSpotLightProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED];
-                success = gDeferredSpotLightProgram.createShader(NULL, NULL);
-        }
-
-        if (success)
-        {
-                gDeferredMultiSpotLightProgram.mName = "Deferred MultiSpotLight Shader";
-                gDeferredMultiSpotLightProgram.mShaderFiles.clear();
-                gDeferredMultiSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/pointLightV.glsl", GL_VERTEX_SHADER_ARB));
-                gDeferredMultiSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/multiSpotLightF.glsl", GL_FRAGMENT_SHADER_ARB));
-                gDeferredMultiSpotLightProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED];
-                success = gDeferredMultiSpotLightProgram.createShader(NULL, NULL);
-        }
-
-        if (success)
-        {
                 gDeferredSunProgram.mName = "Deferred Sun Shader";
                 gDeferredSunProgram.mShaderFiles.clear();
                 gDeferredSunProgram.mShaderFiles.push_back(make_pair("deferred/sunLightV.glsl", GL_VERTEX_SHADER_ARB));
@@ -998,36 +942,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
 
         if (success)
         {
-                gDeferredPostGIProgram.mName = "Deferred Post GI Shader";
-                gDeferredPostGIProgram.mShaderFiles.clear();
-                gDeferredPostGIProgram.mShaderFiles.push_back(make_pair("deferred/postgiV.glsl", GL_VERTEX_SHADER_ARB));
-                gDeferredPostGIProgram.mShaderFiles.push_back(make_pair("deferred/postgiF.glsl", GL_FRAGMENT_SHADER_ARB));
-                gDeferredPostGIProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED];
-                success = gDeferredPostGIProgram.createShader(NULL, NULL);
-        }
-
-        if (success)
-        {
-                gDeferredPostProgram.mName = "Deferred Post  Shader";
-                gDeferredPostProgram.mShaderFiles.clear();
-                gDeferredPostProgram.mShaderFiles.push_back(make_pair("deferred/postDeferredV.glsl", GL_VERTEX_SHADER_ARB));
-                gDeferredPostProgram.mShaderFiles.push_back(make_pair("deferred/postDeferredF.glsl", GL_FRAGMENT_SHADER_ARB));
-                gDeferredPostProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED];
-                success = gDeferredPostProgram.createShader(NULL, NULL);
-        }
-
-        if (success)
-        {
-                gDeferredGIProgram.mName = "Deferred GI Shader";
-                gDeferredGIProgram.mShaderFiles.clear();
-                gDeferredGIProgram.mShaderFiles.push_back(make_pair("deferred/giV.glsl", GL_VERTEX_SHADER_ARB));
-                gDeferredGIProgram.mShaderFiles.push_back(make_pair("deferred/giF.glsl", GL_FRAGMENT_SHADER_ARB));
-                gDeferredGIProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED];
-                success = gDeferredGIProgram.createShader(NULL, NULL);
-        }
-
-        if (success)
-        {
                 // load water shader
                 gDeferredWaterProgram.mName = "Deferred Water Shader";
                 gDeferredWaterProgram.mFeatures.calculatesAtmospherics = true;
@@ -1108,16 +1022,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
                 success = gDeferredAvatarAlphaProgram.createShader(&mAvatarAttribs, &mAvatarUniforms);
         }
 
-        if (success)
-        {
-                gLuminanceGatherProgram.mName = "Luminance Gather Shader";
-                gLuminanceGatherProgram.mShaderFiles.clear();
-                gLuminanceGatherProgram.mShaderFiles.push_back(make_pair("deferred/luminanceV.glsl", GL_VERTEX_SHADER_ARB));
-                gLuminanceGatherProgram.mShaderFiles.push_back(make_pair("deferred/luminanceF.glsl", GL_FRAGMENT_SHADER_ARB));
-                gLuminanceGatherProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED];
-                success = gLuminanceGatherProgram.createShader(NULL, NULL);
-        }
-
         return success;
 }