diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-30 12:17:50 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-30 12:17:50 -0500 |
| commit | 8e8976d21627e81f7f83118d37c052383a22e503 (patch) | |
| tree | 8bbe0818cf9b5c3b60a5aed7e90929ce9ddb2ff9 /indra | |
| parent | eb9e6e295d058a1f331f04f89cffd4898b1561e7 (diff) | |
| parent | a244cff7811b88d76591f429119dd736fa522b1a (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llgl.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index f2105f79d0..628a8d6131 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -1912,7 +1912,7 @@ void LLGLState::checkClientArrays(const std::string& msg, U32 data_mask) glClientActiveTextureARB(GL_TEXTURE0_ARB); gGL.getTexUnit(0)->activate(); - if (gGLManager.mHasVertexShader) + if (gGLManager.mHasVertexShader && LLGLSLShader::sNoFixedFunction) { //make sure vertex attribs are all disabled GLint count; glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &count); diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 748d36eadf..4d94c90cc6 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1017,7 +1017,7 @@ bool LLAppViewer::init() #if LL_WINDOWS if (gGLManager.mIsIntel && - LLFeatureManager::getInstance()->getRecommendedValue("WindLightUseAtmosShaders") > 0 && + LLFeatureManager::getInstance()->getGPUClass() > 0 && gGLManager.mGLVersion <= 3.f) { LLNotificationsUtil::add("IntelOldDriver"); |