summaryrefslogtreecommitdiff
path: root/indra/newview/llviewershadermgr.h
diff options
context:
space:
mode:
authorGraham Madarasz (Graham) <graham@lindenlab.com>2013-02-28 09:33:41 -0800
committerGraham Madarasz (Graham) <graham@lindenlab.com>2013-02-28 09:33:41 -0800
commitdf08808640031bd27a11177ea49a08f797d2d570 (patch)
tree7a9839786ec0a09ccdb8421ced92b14a5ad62d8e /indra/newview/llviewershadermgr.h
parent2c9636a9e5cb016d05741f214ac117dcae1ea317 (diff)
Improve perf of GLSL uniform lookups by name
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
-rw-r--r--indra/newview/llviewershadermgr.h16
1 files changed, 9 insertions, 7 deletions
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;