From a244cff7811b88d76591f429119dd736fa522b1a Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 30 Mar 2012 12:17:34 -0500
Subject: [PATCH] MAINT-778, MAINT-793 Fix for crash when enabling Debug GL on
Mobile Intel 4 Express. Don't pop up driver update notification if GPU class
is < 1
---
indra/llrender/llgl.cpp | 2 +-
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 f2105f79d0d..628a8d6131e 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 748d36eadf6..4d94c90cc62 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");
--
GitLab