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

Fixed a crash for hardware lacking ARB_shader_objects extension support.

Browse Source
This commit is contained in:
Shyotl
2011-10-17 19:05:37 -05:00
parent 67230a3290
commit 8ce30e9ff7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llrender/llglslshader.cpp
View File

@@ -445,9 +445,12 @@ void LLGLSLShader::unbind()
void LLGLSLShader::bindNoShader(void) void LLGLSLShader::bindNoShader(void)
{ {
glUseProgramObjectARB(0); if (gGLManager.mHasShaderObjects)
sCurBoundShader = 0; {
sCurBoundShaderPtr = NULL; glUseProgramObjectARB(0);
sCurBoundShader = 0;
sCurBoundShaderPtr = NULL;
}
} }
S32 LLGLSLShader::enableTexture(S32 uniform, LLTexUnit::eTextureType mode) S32 LLGLSLShader::enableTexture(S32 uniform, LLTexUnit::eTextureType mode)