Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system"

This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d.

Conflicts:

	linden/indra/newview/llsurface.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/pipeline.h

1 files changed, 10 insertions, 10 deletions

diff --git a/linden/indra/newview/lldrawpoolwater.cpp b/linden/indra/newview/lldrawpoolwater.cpp
index d08d004..624b8a8 100644
--- a/linden/indra/newview/lldrawpoolwater.cpp
+++ b/linden/indra/newview/lldrawpoolwater.cpp
@@ -98,7 +98,7 @@ void LLDrawPoolWater::restoreGL()
 
 LLDrawPool *LLDrawPoolWater::instancePool()
 {
-        llwarns << "Should never be calling instancePool on a water pool!" << llendl;
+        llerrs << "Should never be calling instancePool on a water pool!" << llendl;
         return NULL;
 }
 
@@ -401,15 +401,6 @@ void LLDrawPoolWater::shade()
                 shader = &gWaterProgram;
         }
 
-        if (deferred_render)
-        {
-                gPipeline.bindDeferredShader(*shader);
-        }
-        else
-        {
-                shader->bind();
-        }
-
         sTime = (F32)LLFrameTimer::getElapsedSeconds()*0.5f;
         
         S32 reftex = shader->enableTexture(LLViewerShaderMgr::WATER_REFTEX);
@@ -445,6 +436,15 @@ void LLDrawPoolWater::shade()
         
         S32 screentex = shader->enableTexture(LLViewerShaderMgr::WATER_SCREENTEX);      
                 
+        if (deferred_render)
+        {
+                gPipeline.bindDeferredShader(*shader);
+        }
+        else
+        {
+                shader->bind();
+        }
+        
         if (screentex > -1)
         {
                 shader->uniform4fv(LLViewerShaderMgr::WATER_FOGCOLOR, 1, sWaterFogColor.mV);