Skip to content
Snippets Groups Projects
Commit db92b036 authored by David Parks's avatar David Parks
Browse files

SH-2242 Start using "no fixed function" when rendering dynamic textures.

parent 5e87957e
No related branches found
No related tags found
No related merge requests found
...@@ -209,10 +209,7 @@ BOOL LLViewerDynamicTexture::updateAllInstances() ...@@ -209,10 +209,7 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
LLGLSLShader::bindNoShader(); LLGLSLShader::bindNoShader();
LLVertexBuffer::unbind(); LLVertexBuffer::unbind();
//allow fixed function when rendering dynamic textures
bool no_fixed = LLGLSLShader::sNoFixedFunction;
LLGLSLShader::sNoFixedFunction = false;
BOOL result = FALSE; BOOL result = FALSE;
BOOL ret = FALSE ; BOOL ret = FALSE ;
for( S32 order = 0; order < ORDER_COUNT; order++ ) for( S32 order = 0; order < ORDER_COUNT; order++ )
...@@ -243,7 +240,6 @@ BOOL LLViewerDynamicTexture::updateAllInstances() ...@@ -243,7 +240,6 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
} }
} }
LLGLSLShader::sNoFixedFunction = no_fixed;
return ret; return ret;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment