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

SH-2242 Don't make LLDynamicTexture targets use shaders all the time (revisit later).

parent 7821ff23
No related branches found
No related tags found
No related merge requests found
...@@ -210,6 +210,9 @@ BOOL LLViewerDynamicTexture::updateAllInstances() ...@@ -210,6 +210,9 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
LLGLSLShader::bindNoShader(); LLGLSLShader::bindNoShader();
LLVertexBuffer::unbind(); LLVertexBuffer::unbind();
bool no_ff = 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++ )
...@@ -240,6 +243,8 @@ BOOL LLViewerDynamicTexture::updateAllInstances() ...@@ -240,6 +243,8 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
} }
} }
LLGLSLShader::sNoFixedFunction = no_ff;
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