1 files changed, 48 insertions, 29 deletions

diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 7e470bd01f..a5a29dea7b 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -42,11 +42,10 @@
 
 #include "llcubemap.h"
 #include "llsky.h"
-#include "llagent.h"
 #include "lldrawable.h"
 #include "llface.h"
 #include "llviewercamera.h"
-#include "llviewerimagelist.h"	// For debugging
+#include "llviewertexturelist.h"	// For debugging
 #include "llviewerobjectlist.h" // For debugging
 #include "llviewerwindow.h"
 #include "pipeline.h"
@@ -88,22 +87,23 @@ void LLDrawPoolAlpha::beginDeferredPass(S32 pass)
 
 void LLDrawPoolAlpha::endDeferredPass(S32 pass)
 {
-	gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.4f);
+	
+}
+
+void LLDrawPoolAlpha::renderDeferred(S32 pass)
+{
+	gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.f);
 	{
-		LLFastTimer t(LLFastTimer::FTM_RENDER_GRASS);
+		LLFastTimer t(FTM_RENDER_GRASS);
 		gDeferredTreeProgram.bind();
 		LLGLEnable test(GL_ALPHA_TEST);
 		//render alpha masked objects
 		LLRenderPass::renderTexture(LLRenderPass::PASS_ALPHA_MASK, getVertexDataMask());
+		gDeferredTreeProgram.unbind();
 	}			
 	gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
 }
 
-void LLDrawPoolAlpha::renderDeferred(S32 pass)
-{
-	
-}
-
 
 S32 LLDrawPoolAlpha::getNumPostDeferredPasses() 
 { 
@@ -112,7 +112,7 @@ S32 LLDrawPoolAlpha::getNumPostDeferredPasses()
 
 void LLDrawPoolAlpha::beginPostDeferredPass(S32 pass) 
 { 
-	LLFastTimer t(LLFastTimer::FTM_RENDER_ALPHA);
+	LLFastTimer t(FTM_RENDER_ALPHA);
 
 	simple_shader = &gDeferredAlphaProgram;
 	fullbright_shader = &gDeferredFullbrightProgram;
@@ -139,7 +139,7 @@ void LLDrawPoolAlpha::renderPostDeferred(S32 pass)
 
 void LLDrawPoolAlpha::beginRenderPass(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_ALPHA);
+	LLFastTimer t(FTM_RENDER_ALPHA);
 	
 	if (LLPipeline::sUnderWaterRender)
 	{
@@ -163,7 +163,7 @@ void LLDrawPoolAlpha::beginRenderPass(S32 pass)
 
 void LLDrawPoolAlpha::endRenderPass( S32 pass )
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_ALPHA);
+	LLFastTimer t(FTM_RENDER_ALPHA);
 	LLRenderPass::endRenderPass(pass);
 
 	if(gPipeline.canUseWindLightShaders()) 
@@ -174,7 +174,7 @@ void LLDrawPoolAlpha::endRenderPass( S32 pass )
 
 void LLDrawPoolAlpha::render(S32 pass)
 {
-	LLFastTimer t(LLFastTimer::FTM_RENDER_ALPHA);
+	LLFastTimer t(FTM_RENDER_ALPHA);
 
 	LLGLSPipelineAlpha gls_pipeline_alpha;
 
@@ -218,8 +218,8 @@ void LLDrawPoolAlpha::render(S32 pass)
 		}
 		gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
 		glColor4f(1,0,0,1);
-		LLViewerImage::sSmokeImagep->addTextureStats(1024.f*1024.f);
-		gGL.getTexUnit(0)->bind(LLViewerImage::sSmokeImagep.get());
+		LLViewerFetchedTexture::sSmokeImagep->addTextureStats(1024.f*1024.f);
+		gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sSmokeImagep) ;
 		renderAlphaHighlight(LLVertexBuffer::MAP_VERTEX |
 							LLVertexBuffer::MAP_TEXCOORD0);
 	}
@@ -261,6 +261,8 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask)
 {
 	BOOL initialized_lighting = FALSE;
 	BOOL light_enabled = TRUE;
+	S32 diffuse_channel = 0;
+
 	//BOOL is_particle = FALSE;
 	BOOL use_shaders = (LLPipeline::sUnderWaterRender && gPipeline.canUseVertexShaders())
 		|| gPipeline.canUseWindLightShadersOnObjects();
@@ -291,19 +293,6 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask)
 
 				LLRenderPass::applyModelMatrix(params);
 
-				if (params.mTexture.notNull())
-				{
-					gGL.getTexUnit(0)->activate();
-					gGL.getTexUnit(0)->bind(params.mTexture.get());
-					params.mTexture->addTextureStats(params.mVSize);
-					if (params.mTextureMatrix)
-					{
-						glMatrixMode(GL_TEXTURE);
-						glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
-						gPipeline.mTextureMatrixOps++;
-					}
-				}
-
 				if (params.mFullbright)
 				{
 					// Turn off lighting if it hasn't already been so.
@@ -344,11 +333,13 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask)
 					if (deferred_render && current_shader != NULL)
 					{
 						gPipeline.unbindDeferredShader(*current_shader);
+						diffuse_channel = 0;
 					}
 					current_shader = target_shader;
 					if (deferred_render)
 					{
 						gPipeline.bindDeferredShader(*current_shader);
+						diffuse_channel = current_shader->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
 					}
 					else
 					{
@@ -357,11 +348,12 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask)
 				}
 				else if (!use_shaders && current_shader != NULL)
 				{
-					LLGLSLShader::bindNoShader();
 					if (deferred_render)
 					{
 						gPipeline.unbindDeferredShader(*current_shader);
+						diffuse_channel = 0;
 					}
+					LLGLSLShader::bindNoShader();
 					current_shader = NULL;
 				}
 
@@ -369,6 +361,24 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask)
 				{
 					params.mGroup->rebuildMesh();
 				}
+
+				
+				if (params.mTexture.notNull())
+				{
+					gGL.getTexUnit(diffuse_channel)->bind(params.mTexture.get());
+					if(params.mTexture.notNull())
+					{
+						params.mTexture->addTextureStats(params.mVSize);
+					}
+					if (params.mTextureMatrix)
+					{
+						gGL.getTexUnit(0)->activate();
+						glMatrixMode(GL_TEXTURE);
+						glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
+						gPipeline.mTextureMatrixOps++;
+					}
+				}
+
 				params.mVertexBuffer->setBuffer(mask);
 				params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
 				gPipeline.addTrianglesDrawn(params.mCount/3);
@@ -383,6 +393,15 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask)
 		}
 	}
 
+	if (deferred_render && current_shader != NULL)
+	{
+		gPipeline.unbindDeferredShader(*current_shader);
+		LLVertexBuffer::unbind();	
+		LLGLState::checkStates();
+		LLGLState::checkTextureChannels();
+		LLGLState::checkClientArrays();
+	}
+	
 	if (!light_enabled)
 	{
 		gPipeline.enableLightsDynamic();