From 795a61dbb3a4983d48b0bd64bc4d63fbcd49d6dd Mon Sep 17 00:00:00 2001 From: Joshua Rothe Date: Fri, 16 Jan 2026 02:12:52 -0700 Subject: [PATCH] Fixing shader compilation error when writing to FOG when render_mode fog_disabled. Always declares FOG variable regardless of fog state. Previously, only declared fog if FOG_DISABLED was undefined. This caused errors if the code tried to write to fog later. Exists as a dummy variable when unused. Signed-off-by: Joshua Rothe (cherry picked from commit 7a2f188382ecbe7f81a4378e9786e0da0b575f9f) --- drivers/gles3/shaders/scene.glsl | 2 -- .../shaders/forward_clustered/scene_forward_clustered.glsl | 2 -- .../shaders/forward_mobile/scene_forward_mobile.glsl | 4 ---- 3 files changed, 8 deletions(-) diff --git a/drivers/gles3/shaders/scene.glsl b/drivers/gles3/shaders/scene.glsl index b6b0cc40a9..10a5d9f975 100644 --- a/drivers/gles3/shaders/scene.glsl +++ b/drivers/gles3/shaders/scene.glsl @@ -2026,9 +2026,7 @@ void main() { #ifdef PREMUL_ALPHA_USED float premul_alpha = 1.0; #endif // PREMUL_ALPHA_USED -#ifndef FOG_DISABLED vec4 fog = vec4(0.0); -#endif // !FOG_DISABLED #if defined(CUSTOM_RADIANCE_USED) vec4 custom_radiance = vec4(0.0); #endif diff --git a/servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl b/servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl index 4b66ac7426..09505902f4 100644 --- a/servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl +++ b/servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl @@ -1237,9 +1237,7 @@ void fragment_shader(in SceneData scene_data) { float anisotropy = 0.0; vec2 anisotropy_flow = vec2(1.0, 0.0); vec3 energy_compensation = vec3(1.0); -#ifndef FOG_DISABLED vec4 fog = vec4(0.0, 0.0, 0.0, 1.0); -#endif // !FOG_DISABLED #if defined(CUSTOM_RADIANCE_USED) vec4 custom_radiance = vec4(0.0); #endif diff --git a/servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl b/servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl index a11de549d3..c1abc32ef8 100644 --- a/servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl +++ b/servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl @@ -1155,9 +1155,7 @@ void main() { #ifdef PREMUL_ALPHA_USED float premul_alpha_highp = 1.0; #endif -#ifndef FOG_DISABLED vec4 fog_highp = vec4(0.0); -#endif // !FOG_DISABLED #if defined(CUSTOM_RADIANCE_USED) vec4 custom_radiance_highp = vec4(0.0); #endif @@ -1296,9 +1294,7 @@ void main() { #ifdef PREMUL_ALPHA_USED half premul_alpha = half(premul_alpha_highp); #endif -#ifndef FOG_DISABLED hvec4 fog = hvec4(fog_highp); -#endif #ifdef CUSTOM_RADIANCE_USED hvec4 custom_radiance = hvec4(custom_radiance_highp); #endif