diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-04 18:06:29 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-04 18:06:29 -0600 |
| commit | 586025bde53ffcd160a9d169cca328ed5078f5f4 (patch) | |
| tree | 1f59d27d08567fd5f3fe02ce42fe6bae37bd3b2c /indra/newview/lldrawpoolterrain.cpp | |
| parent | 3ee3c3ced32bd1e67a6bea51341734c8764df018 (diff) | |
| parent | 609ed855e1160505238378a1be49e2b92e8496f5 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/lldrawpoolterrain.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index 3805348b6b..cac862a107 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -49,9 +49,6 @@ #include "llviewershadermgr.h" #include "llrender.h" -static LLStaticHashedString sObjectPlaneS("object_plane_s"); -static LLStaticHashedString sObjectPlaneT("object_plane_t"); - const F32 DETAIL_SCALE = 1.f/16.f; int DebugDetailMap = 0; @@ -355,8 +352,8 @@ void LLDrawPoolTerrain::renderFullShader() LLGLSLShader* shader = LLGLSLShader::sCurBoundShaderPtr; llassert(shader); - shader->uniform4fv(sObjectPlaneS, 1, tp0.mV); - shader->uniform4fv(sObjectPlaneT, 1, tp1.mV); + shader->uniform4fv(LLShaderMgr::OBJECT_PLANE_S, 1, tp0.mV); + shader->uniform4fv(LLShaderMgr::OBJECT_PLANE_T, 1, tp1.mV); gGL.matrixMode(LLRender::MM_TEXTURE); gGL.loadIdentity(); @@ -865,8 +862,8 @@ void LLDrawPoolTerrain::renderSimple() if (LLGLSLShader::sNoFixedFunction) { - sShader->uniform4fv(sObjectPlaneS, 1, tp0.mV); - sShader->uniform4fv(sObjectPlaneT, 1, tp1.mV); + sShader->uniform4fv(LLShaderMgr::OBJECT_PLANE_S, 1, tp0.mV); + sShader->uniform4fv(LLShaderMgr::OBJECT_PLANE_T, 1, tp1.mV); } else { |