diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-16 17:13:16 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-16 17:13:16 -0500 |
| commit | f18fd226c32747dfb53f4d4f7b00b7d682133d5e (patch) | |
| tree | fd80f72010af03004e6534638de7887fcd96c62e /indra/newview | |
| parent | d9a241aaf545655ca990216106c65ed87897ad56 (diff) | |
Fix for compilation error in shadows disabled and don't load transform feedback shaders unless transform feedback is enabled.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl | 2 | ||||
| -rwxr-xr-x | indra/newview/llviewershadermgr.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index 9cc2eb0cf3..dc497e063b 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -184,7 +184,7 @@ void main() vary_pointlight_col.rgb = diff; - vary_pointlight_col.a = vertex_color.a; + vary_pointlight_col.a = col.a; col.rgb = vec3(0,0,0); diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index fce06b9e13..99a9bfd9fa 100755 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -463,6 +463,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") && |