diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-03-09 17:35:13 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-03-09 17:35:13 +0800 |
commit | 8f99590d58e02705d7baf799c3c4db6863eb36a4 (patch) | |
tree | 20593a4594acb9e1b8b80ec2d7e0325f63e73492 | |
parent | 2170cca3a9f205bc6dda9d1b084ff5c8821186c9 (diff) |
Comment out sampleReflectionProbesLegacy redeclaration
which isn't used anyway in that file, and differs in parameter
qualifiers, which caused a crash (only) on Ubuntu 24.x, with errors:
Fragment info
-------------
0(857) : error c1106: overloaded function declaration "samplereflectionprobeslegacy" differs only in parameter qualifiers
2025-03-09T07:51:26Z WARNING # llrender/llglslshader.cpp(513) createShader : Failed to link shader: Water Shader
2025-03-09T07:51:26Z WARNING # llrender/llglslshader.cpp(518) createShader : Failed to link using shader level 3 trying again using shader level 2
Vertex info
-----------
0(107) : error C3002: call to undefined function "void calcAtmospherics(vec3);"
-rw-r--r-- | indra/newview/app_settings/shaders/class3/environment/waterF.glsl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class3/environment/waterF.glsl b/indra/newview/app_settings/shaders/class3/environment/waterF.glsl index 7320e9ca06..d08bae0d7d 100644 --- a/indra/newview/app_settings/shaders/class3/environment/waterF.glsl +++ b/indra/newview/app_settings/shaders/class3/environment/waterF.glsl @@ -135,8 +135,10 @@ void sampleReflectionProbesWater(inout vec3 ambenv, inout vec3 glossenv, void sampleReflectionProbes(inout vec3 ambenv, inout vec3 glossenv, vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent, vec3 amblit_linear); +/* void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv, vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit); +*/ vec3 getPositionWithNDC(vec3 ndc); |