From df08808640031bd27a11177ea49a08f797d2d570 Mon Sep 17 00:00:00 2001
From: "Graham Madarasz (Graham)" <graham@lindenlab.com>
Date: Thu, 28 Feb 2013 09:33:41 -0800
Subject: Improve perf of GLSL uniform lookups by name

---
 indra/newview/llviewershadermgr.h | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h
index d6dd645e8c..999baa0ad0 100644
--- a/indra/newview/llviewershadermgr.h
+++ b/indra/newview/llviewershadermgr.h
@@ -177,22 +177,24 @@ public:
 
 private:
 	
-	std::vector<std::string> mShinyUniforms;
+	typedef std::vector< LLStaticHashedString > UniformVec;
+
+	UniformVec mShinyUniforms;
 
 	//water parameters
-	std::vector<std::string> mWaterUniforms;
+	UniformVec mWaterUniforms;
 
-	std::vector<std::string> mWLUniforms;
+	UniformVec mWLUniforms;
 
 	//terrain parameters
-	std::vector<std::string> mTerrainUniforms;
+	UniformVec mTerrainUniforms;
 
 	//glow parameters
-	std::vector<std::string> mGlowUniforms;
+	UniformVec mGlowUniforms;
 
-	std::vector<std::string> mGlowExtractUniforms;
+	UniformVec mGlowExtractUniforms;
 
-	std::vector<std::string> mAvatarUniforms;
+	UniformVec mAvatarUniforms;
 
 	// the list of shaders we need to propagate parameters to.
 	std::vector<LLGLSLShader *> mShaderList;
-- 
cgit v1.2.3


From 609ed855e1160505238378a1be49e2b92e8496f5 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 4 Mar 2013 18:01:42 -0600
Subject: MAINT-2371 More optimizations.

Reviewed by Graham
---
 indra/newview/llviewershadermgr.h | 69 +--------------------------------------
 1 file changed, 1 insertion(+), 68 deletions(-)

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

diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h
index d6dd645e8c..b8552d2d95 100644
--- a/indra/newview/llviewershadermgr.h
+++ b/indra/newview/llviewershadermgr.h
@@ -74,56 +74,7 @@ public:
 		SHADER_COUNT
 	};
 
-	typedef enum
-	{
-		SHINY_ORIGIN = END_RESERVED_UNIFORMS
-	} eShinyUniforms;
-
-	typedef enum
-	{
-		WATER_SCREENTEX = END_RESERVED_UNIFORMS,
-		WATER_SCREENDEPTH,
-		WATER_REFTEX,
-		WATER_EYEVEC,
-		WATER_TIME,
-		WATER_WAVE_DIR1,
-		WATER_WAVE_DIR2,
-		WATER_LIGHT_DIR,
-		WATER_SPECULAR,
-		WATER_SPECULAR_EXP,
-		WATER_FOGCOLOR,
-		WATER_FOGDENSITY,
-		WATER_REFSCALE,
-		WATER_WATERHEIGHT,
-	} eWaterUniforms;
-
-	typedef enum
-	{
-		WL_CAMPOSLOCAL = END_RESERVED_UNIFORMS,
-		WL_WATERHEIGHT
-	} eWLUniforms;
-
-	typedef enum
-	{
-		TERRAIN_DETAIL0 = END_RESERVED_UNIFORMS,
-		TERRAIN_DETAIL1,
-		TERRAIN_DETAIL2,
-		TERRAIN_DETAIL3,
-		TERRAIN_ALPHARAMP
-	} eTerrainUniforms;
-
-	typedef enum
-	{
-		GLOW_DELTA = END_RESERVED_UNIFORMS
-	} eGlowUniforms;
-
-	typedef enum
-	{
-		AVATAR_MATRIX = END_RESERVED_UNIFORMS,
-		AVATAR_WIND,
-		AVATAR_SINWAVE,
-		AVATAR_GRAVITY,
-	} eAvatarUniforms;
+	
 
 	// simple model of forward iterator
 	// http://www.sgi.com/tech/stl/ForwardIterator.html
@@ -176,24 +127,6 @@ public:
 	/* virtual */ void updateShaderUniforms(LLGLSLShader * shader);
 
 private:
-	
-	std::vector<std::string> mShinyUniforms;
-
-	//water parameters
-	std::vector<std::string> mWaterUniforms;
-
-	std::vector<std::string> mWLUniforms;
-
-	//terrain parameters
-	std::vector<std::string> mTerrainUniforms;
-
-	//glow parameters
-	std::vector<std::string> mGlowUniforms;
-
-	std::vector<std::string> mGlowExtractUniforms;
-
-	std::vector<std::string> mAvatarUniforms;
-
 	// the list of shaders we need to propagate parameters to.
 	std::vector<LLGLSLShader *> mShaderList;
 
-- 
cgit v1.2.3


From a65c275865f1cc9bf53237e4b8c99a7bee3731ee Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 5 Mar 2013 01:38:49 -0600
Subject: Merge cleanup.

---
 indra/newview/llviewershadermgr.h | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h
index dd1325277c..6cd52dc736 100644
--- a/indra/newview/llviewershadermgr.h
+++ b/indra/newview/llviewershadermgr.h
@@ -128,7 +128,6 @@ public:
 
 private:
 
-	UniformVec mShinyUniforms;
 	// the list of shaders we need to propagate parameters to.
 	std::vector<LLGLSLShader *> mShaderList;
 
-- 
cgit v1.2.3