diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-20 15:14:16 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-20 15:14:16 -0500 |
| commit | ae31a6f4a7928e4f1be75451ec7dd16c5283ed5b (patch) | |
| tree | e887fa1fac099edb41cc5a2d2e6794067df55913 /indra | |
| parent | 4e894bfa316ff4bc2fa64f711b8442b228573f90 (diff) | |
SH-2240 GL 1.2 compatibility pass
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 16 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 1 |
2 files changed, 15 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 610d3f9f99..774ca2e8e7 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -1453,6 +1453,13 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL } else { + if (!LLGLSLShader::sNoFixedFunction) + { + gGL.getTexUnit(1)->activate(); + gGL.matrixMode(LLRender::MM_TEXTURE); + gGL.loadMatrix((GLfloat*) params.mTextureMatrix->mMatrix); + } + gGL.getTexUnit(0)->activate(); gGL.matrixMode(LLRender::MM_TEXTURE); gGL.loadMatrix((GLfloat*) params.mTextureMatrix->mMatrix); @@ -1494,9 +1501,14 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL } else { - gGL.getTexUnit(1)->activate(); - gGL.loadIdentity(); + if (!LLGLSLShader::sNoFixedFunction) + { + gGL.getTexUnit(1)->activate(); + gGL.matrixMode(LLRender::MM_TEXTURE); + gGL.loadIdentity(); + } gGL.getTexUnit(0)->activate(); + gGL.matrixMode(LLRender::MM_TEXTURE); } gGL.loadIdentity(); gGL.matrixMode(LLRender::MM_MODELVIEW); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index acd708e800..cef4c649d7 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -5090,6 +5090,7 @@ void LLPipeline::setupHWLights(LLDrawPool* pool) // Ambient if (!LLGLSLShader::sNoFixedFunction) { + gGL.syncMatrices(); LLColor4 ambient = gSky.getTotalAmbientColor(); gGL.setAmbientLightColor(ambient); } |