diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-25 12:28:12 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-25 12:28:12 -0500 |
| commit | c54f6cfdc3f44ccb6fee3acd5fa40bd177c67639 (patch) | |
| tree | 3e31695cddef46a5986d9f6f471299e510510681 /indra/newview/llviewershadermgr.cpp | |
| parent | 8b78d115c1e7cbe32f336d6d4250d28c8135ade5 (diff) | |
SH-2622 Make Intel prefer fixed function over shaders where possible.
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index e50625af60..619a9078be 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); |