Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use shaders for dynamic textures.... again.

Browse Source
This commit is contained in:
Shyotl
2011-09-02 05:56:04 -05:00
parent 5d21e676c6
commit 91cb401324
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/lldynamictexture.cpp
View File

@@ -42,6 +42,7 @@
#include "llvertexbuffer.h" #include "llvertexbuffer.h"
#include "llviewerdisplay.h" #include "llviewerdisplay.h"
#include "llrender.h" #include "llrender.h"
#include "llglslshader.h"
// static // static
LLViewerDynamicTexture::instance_list_t LLViewerDynamicTexture::sInstances[ LLViewerDynamicTexture::ORDER_COUNT ]; LLViewerDynamicTexture::instance_list_t LLViewerDynamicTexture::sInstances[ LLViewerDynamicTexture::ORDER_COUNT ];
@@ -210,6 +211,12 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
return TRUE; return TRUE;
} }
LLGLSLShader::bindNoShader();
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 +247,8 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
} }
} }
LLGLSLShader::sNoFixedFunction = no_ff;
return ret; return ret;
} }