diff options
author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-05 20:47:39 +0300 |
---|---|---|
committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-05 20:47:39 +0300 |
commit | a2c4bb80492132f7981a79e61bd8ddec95ad97dd (patch) | |
tree | 0aedf927a4a228fb4c4d59905a81d814762ed453 /indra/newview/llviewershadermgr.cpp | |
parent | 2787be7d3558c3ca1ed15863e875612b1b27ec78 (diff) | |
parent | 5a0547cdc366678a21c23ac4669d9e1a867ca331 (diff) |
STORM-1126 merge 2
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r-- | indra/newview/llviewershadermgr.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index c1abead36e..09325a8c1b 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -1492,6 +1492,16 @@ std::string LLViewerShaderMgr::getShaderDirPrefix(void) void LLViewerShaderMgr::updateShaderUniforms(LLGLSLShader * shader) { - LLWLParamManager::instance()->updateShaderUniforms(shader); - LLWaterParamManager::instance()->updateShaderUniforms(shader); + LLWLParamManager::getInstance()->updateShaderUniforms(shader); + LLWaterParamManager::getInstance()->updateShaderUniforms(shader); +} + +LLViewerShaderMgr::shader_iter LLViewerShaderMgr::beginShaders() const +{ + return mShaderList.begin(); +} + +LLViewerShaderMgr::shader_iter LLViewerShaderMgr::endShaders() const +{ + return mShaderList.end(); } |