diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-17 13:56:04 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-17 13:56:04 -0500 |
| commit | 0ed964fd20c4b55e41d933b41f47583224754025 (patch) | |
| tree | 4f4679fe2e228ef93b7648df501d927822866f15 /indra/newview/llviewershadermgr.cpp | |
| parent | 174eda3ed010280277cf2771e838e902a74d6561 (diff) | |
| parent | 88a42cd453b19e66551a36d635981da5aaa04933 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rwxr-xr-x | indra/newview/llviewershadermgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 022ddb69ce..14d98d9a5a 100755 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -466,6 +466,12 @@ void LLViewerShaderMgr::setShaders() S32 deferred_class = 0; S32 transform_class = gGLManager.mHasTransformFeedback ? 1 : 0; + static LLCachedControl<bool> use_transform_feedback(gSavedSettings, "RenderUseTransformFeedback"); + if (!use_transform_feedback) + { + transform_class = 0; + } + if (LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && gSavedSettings.getBOOL("RenderDeferred") && gSavedSettings.getBOOL("RenderAvatarVP") && |