From c54f6cfdc3f44ccb6fee3acd5fa40bd177c67639 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 25 Oct 2011 12:28:12 -0500
Subject: [PATCH] SH-2622 Make Intel prefer fixed function over shaders where
possible.
---
indra/newview/llviewershadermgr.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index e50625af600..619a9078bea 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -363,8 +363,8 @@ void LLViewerShaderMgr::setShaders()
reentrance = true;
- if (LLRender::sGLCoreProfile || gGLManager.mGLVersion >= 2.f)
- { //ALWAYS use shaders where available
+ if (LLRender::sGLCoreProfile || (gGLManager.mGLVersion >= 2.f && !gGLManager.mIsIntel))
+ { //ALWAYS use shaders where available (except for intel, intel prefers fixed function)
if (!gSavedSettings.getBOOL("VertexShaderEnable"))
{ //vertex shaders MUST be enabled to use core profile
gSavedSettings.setBOOL("VertexShaderEnable", TRUE);
--
GitLab