davep avatar davep committed b1710ed

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

Comments (0)

Files changed (2)

indra/llrender/llgl.cpp

 	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);

indra/newview/llappviewer.cpp

 
 #if LL_WINDOWS
 	if (gGLManager.mIsIntel && 
-		LLFeatureManager::getInstance()->getRecommendedValue("WindLightUseAtmosShaders") > 0 &&
+		LLFeatureManager::getInstance()->getGPUClass() > 0 &&
 		gGLManager.mGLVersion <= 3.f)
 	{
 		LLNotificationsUtil::add("IntelOldDriver");
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.