Update symbol shaders: replace RENDER_SDF define with uniform

GitOrigin-RevId: 323b3ee23ee2c3e7c3250e15a672fa692a42bb58

Author: Andrcraft9

src/render/draw_symbol.ts

@@ -466,10 +466,6 @@ function drawLayerSymbols(
                 baseDefines.push('COLOR_ADJUSTMENT');
             }
 
-            if (bucket.sdfIcons) {
-                baseDefines.push('RENDER_SDF');
-            }
-
             if (renderWithShadows) {
                 baseDefines.push('RENDER_SHADOWS', 'NORMAL_OFFSET');
             }
@@ -515,7 +511,7 @@ function drawLayerSymbols(
 
             const colorAdjustmentMatrix = layer.getColorAdjustmentMatrix(iconSaturation, iconContrast, iconBrightnessMin, iconBrightnessMax);
             const uniformValues = symbolUniformValues(sizeData.kind, size, rotateInShader, iconPitchWithMap, painter,
-                matrix, uLabelPlaneMatrix, uglCoordMatrix, elevationFromSea, false, texSize, [0, 0], true, coord, globeToMercator, mercatorCenter, invMatrix,
+                matrix, uLabelPlaneMatrix, uglCoordMatrix, elevationFromSea, false, bucket.sdfIcons, texSize, [0, 0], true, coord, globeToMercator, mercatorCenter, invMatrix,
                 cameraUpVector, bucket.getProjection(), groundShadowFactor, orientationNormalScale, colorAdjustmentMatrix, transitionProgress, null);
 
             const atlasTexture = tile.imageAtlasTexture ? tile.imageAtlasTexture : null;
@@ -586,8 +582,6 @@ function drawLayerSymbols(
                 baseDefines.push('RENDER_TEXT_AND_SYMBOL');
             }
 
-            baseDefines.push('RENDER_SDF');
-
             if (renderWithShadows) {
                 baseDefines.push('RENDER_SHADOWS', 'NORMAL_OFFSET');
             }
@@ -651,7 +645,7 @@ function drawLayerSymbols(
             const cameraUpVector = bucketIsGlobeProjection ? globeCameraUp : mercatorCameraUp;
 
             const uniformValues = symbolUniformValues(sizeData.kind, size, rotateInShader, textPitchWithMap, painter,
-                matrix, uLabelPlaneMatrix, uglCoordMatrix, elevationFromSea, true, texSize, texSizeIcon, true, coord, globeToMercator, mercatorCenter, invMatrix,
+                matrix, uLabelPlaneMatrix, uglCoordMatrix, elevationFromSea, true, true, texSize, texSizeIcon, true, coord, globeToMercator, mercatorCenter, invMatrix,
                 cameraUpVector, bucket.getProjection(), groundShadowFactor, orientationNormalScale, null, null, textScaleFactor);
 
             const atlasTexture = tile.glyphAtlasTexture ? tile.glyphAtlasTexture : null;

src/render/program/symbol_program.ts

@@ -24,6 +24,7 @@ export type SymbolUniformsType = {
     ['u_label_plane_matrix']: UniformMatrix4f;
     ['u_coord_matrix']: UniformMatrix4f;
     ['u_is_text']: Uniform1i;
+    ['u_is_sdf']: Uniform1i;
     ['u_elevation_from_sea']: Uniform1i;
     ['u_pitch_with_map']: Uniform1i;
     ['u_texsize']: Uniform2f;
@@ -81,7 +82,6 @@ export type SymbolDefinesType =
     | 'ICON_TRANSITION'
     | 'PITCH_WITH_MAP_TERRAIN'
     | 'PROJECTED_POS_ON_VIEWPORT'
-    | 'RENDER_SDF'
     | 'RENDER_TEXT_AND_SYMBOL'
     | 'Z_OFFSET'
     | 'APPLY_LUT_ON_GPU';
@@ -99,6 +99,7 @@ const symbolUniforms = (context: Context): SymbolUniformsType => ({
     'u_label_plane_matrix': new UniformMatrix4f(context),
     'u_coord_matrix': new UniformMatrix4f(context),
     'u_is_text': new Uniform1i(context),
+    'u_is_sdf': new Uniform1i(context),
     'u_elevation_from_sea': new Uniform1i(context),
     'u_pitch_with_map': new Uniform1i(context),
     'u_texsize': new Uniform2f(context),
@@ -158,6 +159,7 @@ const symbolUniformValues = (
     glCoordMatrix: mat4,
     elevationFromSea: boolean,
     isText: boolean,
+    isSDF: boolean,
     texSize: [number, number],
     texSizeIcon: [number, number],
     isHalo: boolean,
@@ -188,6 +190,7 @@ const symbolUniformValues = (
         'u_label_plane_matrix': labelPlaneMatrix,
         'u_coord_matrix': glCoordMatrix,
         'u_is_text': +isText,
+        'u_is_sdf': +isSDF,
         'u_elevation_from_sea': elevationFromSea ? 1.0 : 0.0,
         'u_pitch_with_map': +pitchWithMap,
         'u_texsize': texSize,
@@ -204,7 +207,7 @@ const symbolUniformValues = (
         'u_up_vector': [0, -1, 0] as [number, number, number],
         'u_color_adj_mat': colorAdjustmentMatrix,
         'u_icon_transition': transition ? transition : 0.0,
-        'u_gamma_scale': pitchWithMap ? painter.transform.getCameraToCenterDistance(projection) * Math.cos(painter.terrain ? 0 : painter.transform._pitch) : 1,
+        'u_gamma_scale': isSDF ? (pitchWithMap ? painter.transform.getCameraToCenterDistance(projection) * Math.cos(painter.terrain ? 0 : painter.transform._pitch) : 1) : 0,
         'u_device_pixel_ratio': browser.devicePixelRatio,
         'u_is_halo': +isHalo,
         'u_scale_factor': scaleFactor ? scaleFactor : 1.0,

src/shaders/symbol.fragment.glsl

@@ -9,12 +9,13 @@ uniform sampler2D u_texture;
 #ifdef RENDER_TEXT_AND_SYMBOL
 uniform sampler2D u_texture_icon;
 #endif
-#ifdef RENDER_SDF
+
 uniform highp float u_gamma_scale;
 uniform lowp float u_device_pixel_ratio;
 uniform bool u_is_text;
+uniform bool u_is_sdf;
 uniform lowp float u_scale_factor;
-#endif
+
 // Boolean-config transition fragment alpha multiplier (dual-pass: originals + deltas).
 uniform lowp float u_opacity_multiplier;
 #ifdef ICON_TRANSITION
@@ -38,9 +39,7 @@ in vec2 v_tex_a;
 in vec2 v_tex_b;
 #endif
 
-#ifdef RENDER_SDF
 in float v_draw_halo;
-#endif
 in vec3 v_gamma_scale_size_fade_opacity;
 #ifdef RENDER_TEXT_AND_SYMBOL
 in float is_sdf;
@@ -61,13 +60,10 @@ uniform highp sampler3D u_lutTexture;
 
 /// Symbol paint properties.
 in lowp float v_opacity;
-#ifdef RENDER_SDF
 in lowp vec4 v_fill_np_color;
 in lowp vec4 v_halo_np_color;
 in lowp float v_halo_width;
 in lowp float v_halo_blur;
-#endif
-
 #ifdef LIGHTING_3D_MODE
 in lowp float v_emissive_strength;
 #endif
@@ -78,14 +74,13 @@ void main() {
     lowp vec4 halo_color = vec4(0.0);
     lowp float halo_width = 0.0;
     lowp float halo_blur = 0.0;
-#ifdef RENDER_SDF
-    // Pre-multiply colors by alpha.
-    fill_color = vec4(v_fill_np_color.rgb * v_fill_np_color.a, v_fill_np_color.a);
-    halo_color = vec4(v_halo_np_color.rgb * v_halo_np_color.a, v_halo_np_color.a);
-    halo_width = v_halo_width;
-    halo_blur = v_halo_blur;
-#endif
-
+    if (u_is_sdf) {
+        // Pre-multiply colors by alpha.
+        fill_color = vec4(v_fill_np_color.rgb * v_fill_np_color.a, v_fill_np_color.a);
+        halo_color = vec4(v_halo_np_color.rgb * v_halo_np_color.a, v_halo_np_color.a);
+        halo_width = v_halo_width;
+        halo_blur = v_halo_blur;
+    }
     lowp float emissive_strength = 0.0;
 #ifdef LIGHTING_3D_MODE
     emissive_strength = v_emissive_strength;
@@ -112,47 +107,47 @@ void main() {
     cutout_factors = get_cutout_factors(gl_FragCoord);
 #endif
 
-#ifdef RENDER_SDF
-    float EDGE_GAMMA = 0.105 / u_device_pixel_ratio;
+    if (u_is_sdf) {
+        float EDGE_GAMMA = 0.105 / u_device_pixel_ratio;
 
-    float gamma_scale = v_gamma_scale_size_fade_opacity.x;
-    float size = v_gamma_scale_size_fade_opacity.y;
+        float gamma_scale = v_gamma_scale_size_fade_opacity.x;
+        float size = v_gamma_scale_size_fade_opacity.y;
 
-    float fontScale = u_is_text ? size / 24.0 : size;
+        float fontScale = u_is_text ? size / 24.0 : size;
 
-    out_color = fill_color;
-    highp float gamma = EDGE_GAMMA / (fontScale * u_gamma_scale);
-    lowp float buff = (256.0 - 64.0) / 256.0;
+        out_color = fill_color;
+        highp float gamma = EDGE_GAMMA / (fontScale * u_gamma_scale);
+        lowp float buff = (256.0 - 64.0) / 256.0;
 
-    bool draw_halo = v_draw_halo > 0.0;
-    if (draw_halo) {
-        out_color = halo_color;
-        gamma = (halo_blur * u_scale_factor * 1.19 / SDF_PX + EDGE_GAMMA) / (fontScale * u_gamma_scale);
-        buff = (6.0 - halo_width * u_scale_factor / fontScale) / SDF_PX;
-    }
+        bool draw_halo = v_draw_halo > 0.0;
+        if (draw_halo) {
+            out_color = halo_color;
+            gamma = (halo_blur * u_scale_factor * 1.19 / SDF_PX + EDGE_GAMMA) / (fontScale * u_gamma_scale);
+            buff = (6.0 - halo_width * u_scale_factor / fontScale) / SDF_PX;
+        }
 
-    lowp float dist = texture(u_texture, v_tex_a).r;
-    highp float gamma_scaled = gamma * gamma_scale;
-    highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);
+        lowp float dist = texture(u_texture, v_tex_a).r;
+        highp float gamma_scaled = gamma * gamma_scale;
+        highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);
 
-    out_color *= alpha;
-#else // RENDER_SDF
-    #ifdef ICON_TRANSITION
+        out_color *= alpha;
+    } else {
+#ifdef ICON_TRANSITION
         vec4 a = texture(u_texture, v_tex_a) * (1.0 - u_icon_transition);
         vec4 b = texture(u_texture, v_tex_b) * u_icon_transition;
         out_color = (a + b);
-    #else
+#else
         out_color = texture(u_texture, v_tex_a);
-    #endif
+#endif
 
-    #ifdef APPLY_LUT_ON_GPU
+#ifdef APPLY_LUT_ON_GPU
         out_color = applyLUT(u_lutTexture, out_color);
-    #endif
+#endif
 
-    #ifdef COLOR_ADJUSTMENT
+#ifdef COLOR_ADJUSTMENT
         out_color = u_color_adj_mat * out_color;
-    #endif
 #endif
+    }
 
     out_color *= opacity * fade_opacity * u_opacity_multiplier;