livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for compilation error in shadows disabled and don't load transform feedback shaders unless transform feedback is enabled.

meow-7.2.2
Dave Parks 2013-05-16 17:13:16 -05:00
parent d9a241aaf5
commit f18fd226c3
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl
View File

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

6
indra/newview/llviewershadermgr.cpp
View File

@ -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") &&