diff options
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
-rw-r--r-- | indra/newview/llviewershadermgr.h | 16 |
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; |