diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-17 00:24:08 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-17 00:24:08 -0500 |
| commit | 6469f1c2f21ecd3b15a18957d882ef6a16b17ecf (patch) | |
| tree | 3159983e7a9c6c008d8334bceb672dfc16e2ca35 /indra/llrender/llcubemap.cpp | |
| parent | ddbd5cee7480e565e447486a21e67c301a716b1f (diff) | |
SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available.
Diffstat (limited to 'indra/llrender/llcubemap.cpp')
| -rw-r--r-- | indra/llrender/llcubemap.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp index fb22d7f1f5..1b10354c22 100644 --- a/indra/llrender/llcubemap.cpp +++ b/indra/llrender/llcubemap.cpp @@ -259,7 +259,7 @@ void LLCubeMap::setMatrix(S32 stage) if (mMatrixStage < 0) return; - if (stage > 0) + //if (stage > 0) { gGL.getTexUnit(stage)->activate(); } @@ -278,17 +278,17 @@ void LLCubeMap::setMatrix(S32 stage) glLoadMatrixf((F32 *)trans.mMatrix); glMatrixMode(GL_MODELVIEW); - if (stage > 0) + /*if (stage > 0) { gGL.getTexUnit(0)->activate(); - } + }*/ } void LLCubeMap::restoreMatrix() { if (mMatrixStage < 0) return; - if (mMatrixStage > 0) + //if (mMatrixStage > 0) { gGL.getTexUnit(mMatrixStage)->activate(); } @@ -296,10 +296,10 @@ void LLCubeMap::restoreMatrix() glPopMatrix(); glMatrixMode(GL_MODELVIEW); - if (mMatrixStage > 0) + /*if (mMatrixStage > 0) { gGL.getTexUnit(0)->activate(); - } + }*/ } void LLCubeMap::setReflection (void) |