livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-2510 Potential fix for crash on startup on systems that don't have GL_ARB_shader_objects

meow-7.2.2
Dave Parks 2011-10-12 10:51:10 -05:00
parent 9a0bb3d871
commit 6c157557dc
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llrender/llglslshader.cpp
View File

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

1
indra/newview/featuretable.txt
View File

@ -65,6 +65,7 @@ RenderShadowDetail 1 2
WatchdogDisabled 1 1
RenderUseStreamVBO 1 1
RenderFSAASamples 1 16
RenderMaxTextureIndex 1 32
//
// Low Graphics Settings

1
indra/newview/featuretable_xp.txt
View File

@ -65,6 +65,7 @@ RenderShadowDetail 1 0
WatchdogDisabled 1 1
RenderUseStreamVBO 1 1
RenderFSAASamples 1 16
RenderMaxTextureIndex 1 32
//
// Low Graphics Settings