Merge pull request #3262 from secondlife/rye/extra-mesafix

brad-linden · web-flow · commit 67b9779d555c · 2024-12-13T16:01:44.000-08:00
Fix mesa failing to link shaders due to missing vertex shader outputs
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
@@ -79,7 +79,7 @@ bool LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
     //////////////////////////////////////
 
     // NOTE order of shader object attaching is VERY IMPORTANT!!!
-    if (features->calculatesAtmospherics)
+    if (features->calculatesAtmospherics || features->hasGamma || features->isDeferred)
     {
         if (!shader->attachVertexObject("windlight/atmosphericsVarsV.glsl"))
         {

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ bool LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)`
`79`	`79`	`//////////////////////////////////////`
`80`	`80`
`81`	`81`	`// NOTE order of shader object attaching is VERY IMPORTANT!!!`
`82`		`- if (features->calculatesAtmospherics)`
	`82`	`+ if (features->calculatesAtmospherics \|\| features->hasGamma \|\| features->isDeferred)`
`83`	`83`	`{`
`84`	`84`	`if (!shader->attachVertexObject("windlight/atmosphericsVarsV.glsl"))`
`85`	`85`	`{`