Commits

davep committed f5b714a Merge

merge

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