diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-12 10:51:10 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-12 10:51:10 -0500 |
| commit | 6c157557dc50806670dcf7fb5aa14bc5f9678282 (patch) | |
| tree | 7c115748c76c0cb868a4571bdb42e83f74c01f72 | |
| parent | 9a0bb3d871d476d43edc6c7a29f6bedff1c45247 (diff) | |
SH-2510 Potential fix for crash on startup on systems that don't have GL_ARB_shader_objects
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 9 | ||||
| -rwxr-xr-x | indra/newview/featuretable.txt | 1 | ||||
| -rw-r--r-- | indra/newview/featuretable_xp.txt | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index deb022fd75..d6ab5208c6 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -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) diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 9379d336d0..22d76cb082 100755 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -65,6 +65,7 @@ RenderShadowDetail 1 2 WatchdogDisabled 1 1 RenderUseStreamVBO 1 1 RenderFSAASamples 1 16 +RenderMaxTextureIndex 1 32 // // Low Graphics Settings diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt index fffd30c0d8..a8e13ce65c 100644 --- a/indra/newview/featuretable_xp.txt +++ b/indra/newview/featuretable_xp.txt @@ -65,6 +65,7 @@ RenderShadowDetail 1 0 WatchdogDisabled 1 1 RenderUseStreamVBO 1 1 RenderFSAASamples 1 16 +RenderMaxTextureIndex 1 32 // // Low Graphics Settings |