From 14f6bbadef2c39e58a3b54c0c6212949acf50e45 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 8 Aug 2011 15:29:23 -0500
Subject: SH-2242 Work in progress migrating to glVertexAttrib everywhere

---
 indra/newview/pipeline.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/pipeline.h')

diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 28e6526acd..61ab84588d 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -536,6 +536,9 @@ public:
 	LLRenderTarget			mHighlight;
 	LLRenderTarget			mPhysicsDisplay;
 
+	//utility buffer for rendering post effects, gets abused by renderDeferredLighting
+	LLPointer<LLVertexBuffer> mDeferredVB;
+
 	//sun shadow map
 	LLRenderTarget			mShadow[6];
 	std::vector<LLVector3>	mShadowFrustPoints[4];
@@ -581,6 +584,7 @@ public:
 
 	LLColor4				mSunDiffuse;
 	LLVector3				mSunDir;
+	LLVector3				mTransformedSunDir;
 
 	BOOL					mInitialized;
 	BOOL					mVertexShadersEnabled;
-- 
cgit v1.2.3


From 2dd8ce53e4e0d14f2bc20796eb6bdf1ef12a65df Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 11 Aug 2011 14:19:58 -0500
Subject: SH-2242 FXAA support instead of unreliable multisample textures (done
 here because it's a smaller change than integrating glVertexAttrib with FSAA
 pipe).  Shader integration with LLDynamicTexture subclasses.

---
 indra/newview/pipeline.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/pipeline.h')

diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 61ab84588d..159ec612d3 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -527,6 +527,7 @@ public:
 	LLRenderTarget			mScreen;
 	LLRenderTarget			mUIScreen;
 	LLRenderTarget			mDeferredScreen;
+	LLRenderTarget			mFXAABuffer;
 	LLRenderTarget			mEdgeMap;
 	LLRenderTarget			mDeferredDepth;
 	LLRenderTarget			mDeferredLight[3];
-- 
cgit v1.2.3