summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-08-10 14:49:11 -0500
committerDave Parks <davep@lindenlab.com>2011-08-10 14:49:11 -0500
commitdb92b0369194f1a81b92fd3fa72458eb0c1d2f20 (patch)
tree8232bcf81ccf340ee3fe81b053faf7e29e44885e /indra
parent5e87957e053268031d1bd880b7f8e6f713394c5e (diff)
SH-2242 Start using "no fixed function" when rendering dynamic textures.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lldynamictexture.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index 799866091b..4955b6224e 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -209,10 +209,7 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
LLGLSLShader::bindNoShader();
LLVertexBuffer::unbind();
- //allow fixed function when rendering dynamic textures
- bool no_fixed = LLGLSLShader::sNoFixedFunction;
- LLGLSLShader::sNoFixedFunction = false;
-
+
BOOL result = FALSE;
BOOL ret = FALSE ;
for( S32 order = 0; order < ORDER_COUNT; order++ )
@@ -243,7 +240,6 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
}
}
- LLGLSLShader::sNoFixedFunction = no_fixed;
return ret;
}