move certain shader features from implicit to explicit includes

GitOrigin-RevId: 3492529beda62fb98d8c290f1a3bf9629cb33bfb

Author: aleksigron

3d-style/shaders/_prelude_shadow.fragment.glsl

@@ -12,11 +12,29 @@ uniform vec2 u_fade_range;
 uniform mediump vec3 u_shadow_direction;
 uniform highp vec3 u_shadow_bias;
 
+// Metal/SPIRV-Cross depth-compare sampling needs Y negated when mapping light-view NDC to
+// shadow-map UV. Vulkan and GL do not define SHADOW_MAP_FLIP_Y.
+highp vec2 shadow_map_ndc_to_uv(highp vec2 ndc_xy) {
+#ifdef SHADOW_MAP_FLIP_Y
+    return ndc_xy * vec2(0.5, -0.5) + 0.5;
+#else
+    return ndc_xy * 0.5 + 0.5;
+#endif
+}
+
+highp vec3 shadow_map_ndc_to_sample_space(highp vec3 ndc) {
+#ifdef CLIP_ZERO_TO_ONE
+    return vec3(shadow_map_ndc_to_uv(ndc.xy), ndc.z);
+#else
+    return vec3(shadow_map_ndc_to_uv(ndc.xy), ndc.z * 0.5 + 0.5);
+#endif
+}
+
 float shadow_sample(sampler2DShadow shadowmap, highp vec3 pos, highp float bias) {
 #ifdef CLIP_ZERO_TO_ONE
-    highp vec3 coord = vec3(pos.xy * 0.5 + 0.5, pos.z - bias);
+    highp vec3 coord = vec3(shadow_map_ndc_to_uv(pos.xy), pos.z - bias);
 #else
-    highp vec3 coord = vec3(pos.xy * 0.5 + 0.5, pos.z * 0.5 + 0.5 - bias);
+    highp vec3 coord = vec3(shadow_map_ndc_to_uv(pos.xy), pos.z * 0.5 + 0.5 - bias);
 #endif
     return texture(shadowmap, coord);
 }
@@ -95,7 +113,7 @@ highp vec2 compute_receiver_plane_depth_bias(highp vec3 pos_dx, highp vec3 pos_d
     return biasUV;
 }
 float shadowed_light_factor_plane_bias(highp vec4 light_view_pos0, highp vec4 light_view_pos1, float view_depth) {
-    highp vec3 light_view_pos0_xyz = light_view_pos0.xyz / light_view_pos0.w * 0.5 + 0.5;
+    highp vec3 light_view_pos0_xyz = shadow_map_ndc_to_sample_space(light_view_pos0.xyz / light_view_pos0.w);
     highp vec3 light_view_pos0_ddx = dFdx(light_view_pos0_xyz);
     highp vec3 light_view_pos0_ddy = dFdy(light_view_pos0_xyz);
     highp vec2 plane_depth_bias = compute_receiver_plane_depth_bias(light_view_pos0_ddx, light_view_pos0_ddy);

3d-style/shaders/building.fragment.glsl

@@ -1,6 +1,8 @@
 #include "_prelude_fog.fragment.glsl"
 #include "_prelude_shadow.fragment.glsl"
 #include "_prelude_lighting.glsl"
+#include "_prelude_indicator_cutout.fragment.glsl"
+#include "_prelude_feature_cutout.fragment.glsl"
 
 const float window_depth = 0.5; // meters
 const float ao_radius = 0.2; // meters
@@ -240,7 +242,7 @@ void main() {
     {
         float ditherOpacity = cutoutGroundRoofOpacity(v_ground_roof);
         if (ditherOpacity < 1.0) {
-            int index = (int(gl_FragCoord.x) % 4) * 4 + (int(gl_FragCoord.y) % 4);
+            int index = viewport_dither_index(gl_FragCoord.xy);
             if (ditherOpacity < DITHER_THRESHOLDS[index]) {
                 discard;
             }
@@ -253,7 +255,7 @@ void main() {
 
 #ifdef RENDER_FRONT_CUTOFF
     if (v_front_cutoff_opacity < 1.0) {
-        int index = (int(gl_FragCoord.x) % 4) * 4 + (int(gl_FragCoord.y) % 4);
+        int index = viewport_dither_index(gl_FragCoord.xy);
         if (v_front_cutoff_opacity < DITHER_THRESHOLDS[index]) {
             discard;
         }

3d-style/shaders/elevated_structures_depth_reconstruct.fragment.glsl

@@ -1,3 +1,5 @@
+#include "_prelude_feature_cutout.fragment.glsl"
+
 #ifdef DEPTH_RECONSTRUCTION
 in float v_height;
 #endif

3d-style/shaders/elevated_structures_model.fragment.glsl

@@ -1,6 +1,8 @@
 #include "_prelude_fog.fragment.glsl"
 #include "_prelude_lighting.glsl"
 #include "_prelude_shadow.fragment.glsl"
+#include "_prelude_indicator_cutout.fragment.glsl"
+#include "_prelude_feature_cutout.fragment.glsl"
 
 in vec3 v_normal;
 in float v_height;

3d-style/shaders/ground_shadow.fragment.glsl

@@ -1,4 +1,6 @@
 #include "_prelude_shadow.fragment.glsl"
+#include "_prelude_indicator_cutout.fragment.glsl"
+#include "_prelude_feature_cutout.fragment.glsl"
 
 precision highp float;
 

3d-style/shaders/model.fragment.glsl

@@ -1,6 +1,8 @@
 #include "_prelude_fog.fragment.glsl"
 #include "_prelude_shadow.fragment.glsl"
 #include "_prelude_lighting.glsl"
+#include "_prelude_indicator_cutout.fragment.glsl"
+#include "_prelude_feature_cutout.fragment.glsl"
 
 uniform float u_opacity;
 

3d-style/shaders/model.vertex.glsl

@@ -1,5 +1,6 @@
 #include "_prelude_fog.vertex.glsl"
 #include "_prelude_shadow.vertex.glsl"
+#include "_prelude_feature_cutout.vertex.glsl"
 
 in vec3 a_pos_3f;
 

src/shaders/_prelude.fragment.glsl

@@ -32,57 +32,16 @@ highp vec4 pack_depth(highp float ndc_z) {
     return res;
 }
 
-#ifdef INDICATOR_CUTOUT
-uniform vec3 u_indicator_cutout_centers;
-uniform vec4 u_indicator_cutout_params;
-#endif
-
 const float DITHER_THRESHOLDS[16] = float[16](
     1.0 / 17.0,  9.0 / 17.0,  3.0 / 17.0, 11.0 / 17.0,
     13.0 / 17.0,  5.0 / 17.0, 15.0 / 17.0,  7.0 / 17.0,
     4.0 / 17.0, 12.0 / 17.0,  2.0 / 17.0, 10.0 / 17.0,
     16.0 / 17.0,  8.0 / 17.0, 14.0 / 17.0,  6.0 / 17.0
 );
 
-vec4 applyCutout(vec4 color, float height) {
-#ifdef INDICATOR_CUTOUT
-    float verticalFadeRange = u_indicator_cutout_centers.z * 0.25; // Fade relative to the height of the indicator
-    float holeMinOpacity = mix(1.0, u_indicator_cutout_params.x, smoothstep(u_indicator_cutout_centers.z, u_indicator_cutout_centers.z + verticalFadeRange, height));
-    float holeRadius = max(u_indicator_cutout_params.y, 0.0);
-    float holeAspectRatio = u_indicator_cutout_params.z;
-    float fadeStart = u_indicator_cutout_params.w;
-    float distA = distance(vec2(gl_FragCoord.x, gl_FragCoord.y * holeAspectRatio), vec2(u_indicator_cutout_centers[0], u_indicator_cutout_centers[1] * holeAspectRatio));
-    return color * min(smoothstep(fadeStart, holeRadius, distA) + holeMinOpacity, 1.0);
-#else
-    return color;
-#endif
-}
-
-// Cutout with uniform vertical transparency across the building face.
-// All coordinates are in NDC [-1,1]. Centers, radius, fadeStart pre-converted to NDC on CPU.
-// groundRoof = (groundNdcX, groundNdcY, roofNdcX, roofNdcY).
-// Returns indicator cutout opacity for dithering. Color is not modified.
-float cutoutGroundRoofOpacity(vec4 groundRoof) {
-#ifdef INDICATOR_CUTOUT
-    float fadeStartX = u_indicator_cutout_params.w;
-    float holeRadius = u_indicator_cutout_params.y;
-
-    float holeMinOpacity = mix(u_indicator_cutout_params.x, 1.0,
-        smoothstep(u_indicator_cutout_params.z, u_indicator_cutout_centers.z, groundRoof.y));
-
-    float distX = abs(u_indicator_cutout_centers.x - groundRoof.x);
-
-    float roofOpacity = mix(holeMinOpacity, 1.0,
-        smoothstep(fadeStartX, holeRadius,
-                   u_indicator_cutout_centers.y - groundRoof.w));
-
-    float groundOpacity = min(smoothstep(fadeStartX, holeRadius, distX)
-                              + holeMinOpacity, 1.0);
-
-    return max(roofOpacity, groundOpacity);
-#else
-    return 1.0;
-#endif
+// Bayer dither index in gl_FragCoord framebuffer space (front-cutoff, indicator cutout).
+int viewport_dither_index(vec2 fragCoordXY) {
+    return (int(fragCoordXY.x) % 4) * 4 + (int(fragCoordXY.y) % 4);
 }
 
 #ifdef DEBUG_WIREFRAME

src/shaders/_prelude_indicator_cutout.fragment.glsl

@@ -0,0 +1,48 @@
+// NOTE: Include explicitly in fragment shaders that use indicator cutout
+// (applyCutout, cutoutGroundRoofOpacity).
+
+#ifdef INDICATOR_CUTOUT
+uniform vec3 u_indicator_cutout_centers;
+uniform vec4 u_indicator_cutout_params;
+#endif
+
+vec4 applyCutout(vec4 color, float height) {
+#ifdef INDICATOR_CUTOUT
+    float verticalFadeRange = u_indicator_cutout_centers.z * 0.25; // Fade relative to the height of the indicator
+    float holeMinOpacity = mix(1.0, u_indicator_cutout_params.x, smoothstep(u_indicator_cutout_centers.z, u_indicator_cutout_centers.z + verticalFadeRange, height));
+    float holeRadius = max(u_indicator_cutout_params.y, 0.0);
+    float holeAspectRatio = u_indicator_cutout_params.z;
+    float fadeStart = u_indicator_cutout_params.w;
+    float distA = distance(vec2(gl_FragCoord.x, gl_FragCoord.y * holeAspectRatio), vec2(u_indicator_cutout_centers[0], u_indicator_cutout_centers[1] * holeAspectRatio));
+    return color * min(smoothstep(fadeStart, holeRadius, distA) + holeMinOpacity, 1.0);
+#else
+    return color;
+#endif
+}
+
+// Cutout with uniform vertical transparency across the building face.
+// All coordinates are in NDC [-1,1]. Centers, radius, fadeStart pre-converted to NDC on CPU.
+// groundRoof = (groundNdcX, groundNdcY, roofNdcX, roofNdcY).
+// Returns indicator cutout opacity for dithering. Color is not modified.
+float cutoutGroundRoofOpacity(vec4 groundRoof) {
+#ifdef INDICATOR_CUTOUT
+    float fadeStartX = u_indicator_cutout_params.w;
+    float holeRadius = u_indicator_cutout_params.y;
+
+    float holeMinOpacity = mix(u_indicator_cutout_params.x, 1.0,
+        smoothstep(u_indicator_cutout_params.z, u_indicator_cutout_centers.z, groundRoof.y));
+
+    float distX = abs(u_indicator_cutout_centers.x - groundRoof.x);
+
+    float roofOpacity = mix(holeMinOpacity, 1.0,
+        smoothstep(fadeStartX, holeRadius,
+                   u_indicator_cutout_centers.y - groundRoof.w));
+
+    float groundOpacity = min(smoothstep(fadeStartX, holeRadius, distX)
+                              + holeMinOpacity, 1.0);
+
+    return max(roofOpacity, groundOpacity);
+#else
+    return 1.0;
+#endif
+}

src/shaders/_prelude_terrain.vertex.glsl

@@ -8,17 +8,20 @@
     uniform vec3 u_tile_br_up;
     uniform vec3 u_tile_bl_up;
     uniform float u_tile_up_scale;
-    vec3 elevationVector(vec2 pos) {
-        vec2 uv = pos / EXTENT;
-        vec3 up = normalize(mix(
-            mix(u_tile_tl_up, u_tile_tr_up, uv.xxx),
-            mix(u_tile_bl_up, u_tile_br_up, uv.xxx),
-            uv.yyy));
-        return up * u_tile_up_scale;
-    }
+#endif // PROJECTION_GLOBE_VIEW
+
+vec3 elevationVector(vec2 pos) {
+#ifdef PROJECTION_GLOBE_VIEW
+    vec2 uv = pos / EXTENT;
+    vec3 up = normalize(mix(
+        mix(u_tile_tl_up, u_tile_tr_up, uv.xxx),
+        mix(u_tile_bl_up, u_tile_br_up, uv.xxx),
+        uv.yyy));
+    return up * u_tile_up_scale;
 #else // PROJECTION_GLOBE_VIEW
-    vec3 elevationVector(vec2 pos) { return vec3(0, 0, 1); }
+    return vec3(0, 0, 1);
 #endif // PROJECTION_GLOBE_VIEW
+}
 
 #ifdef TERRAIN
 
@@ -79,24 +82,6 @@
         #endif // TERRAIN_DEM_FLOAT_FORMAT
     }
 
-    #ifdef TERRAIN_VERTEX_MORPHING
-        float elevation(vec2 apos) {
-            #ifdef ZERO_EXAGGERATION
-                return 0.0;
-            #endif // ZERO_EXAGGERATION
-            float nextElevation = currentElevation(apos);
-            float prevElevation = prevElevation(apos);
-            return mix(prevElevation, nextElevation, u_dem_lerp);
-        }
-    #else // TERRAIN_VERTEX_MORPHING
-        float elevation(vec2 apos) {
-            #ifdef ZERO_EXAGGERATION
-                return 0.0;
-            #endif // ZERO_EXAGGERATION
-            return currentElevation(apos);
-        }
-    #endif // TERRAIN_VERTEX_MORPHING
-
     // BEGIN: code for fill-extrusion height offseting
     // When making changes here please also update associated JS ports in src/style/style_layer/fill-extrusion-style-layer.js
     // This is so that rendering changes are reflected on CPU side for feature querying.
@@ -144,11 +129,24 @@
 
     // END: code for fill-extrusion height offseting
 
-#else // TERRAIN
-
-    float elevation(vec2 pos) { return 0.0; }
+#endif // TERRAIN
 
-#endif
+float elevation(vec2 apos) {
+#ifdef TERRAIN
+    #ifdef ZERO_EXAGGERATION
+        return 0.0;
+    #endif // ZERO_EXAGGERATION
+    #ifdef TERRAIN_VERTEX_MORPHING
+        float nextElevation = currentElevation(apos);
+        float prevElevation = prevElevation(apos);
+        return mix(prevElevation, nextElevation, u_dem_lerp);
+    #else // TERRAIN_VERTEX_MORPHING
+        return currentElevation(apos);
+    #endif // TERRAIN_VERTEX_MORPHING
+#else // TERRAIN
+    return 0.0;
+#endif // TERRAIN
+}
 
 #ifdef DEPTH_OCCLUSION