Use integer attributes in shader when CPU side data is integer

GitOrigin-RevId: 1e8ef6f94afdde94bb74006269e3c7566cacbdf7

Author: aleksigron

3d-style/data/bucket/building_bucket.ts

@@ -847,9 +847,9 @@ export class BuildingBucket implements BucketWithGroundEffect {
                 }
 
                 if (mesh.buildingPart === BUILDING_PART_WALL) {
-                    building.layoutFloodLightDataArray.uint16.fill(floodLightWallRadiusNormalized, partVertexOffset, partVertexOffset + partVertexCount);
+                    building.layoutFloodLightDataArray.int16.fill(floodLightWallRadiusNormalized, partVertexOffset, partVertexOffset + partVertexCount);
                 } else {
-                    building.layoutFloodLightDataArray.uint16.fill(0, partVertexOffset, partVertexOffset + partVertexCount);
+                    building.layoutFloodLightDataArray.int16.fill(0, partVertexOffset, partVertexOffset + partVertexCount);
                 }
 
                 if (hasFauxFacade) {

3d-style/data/building_attributes.ts

@@ -35,7 +35,7 @@ export const buildingBloomAttenuationAttributes: StructArrayLayout = createLayou
 ]);
 
 export const buildingFloodLightWallRadiusAttributes: StructArrayLayout = createLayout([
-    {name: 'a_flood_light_wall_radius_1i16',  components: 1, type: 'Uint16'}
+    {name: 'a_flood_light_wall_radius_1i16',  components: 1, type: 'Int16'}
 ]);
 
 export const {members, size, alignment} = buildingPositionAttributes;

3d-style/render/draw_building.ts

@@ -336,15 +336,14 @@ function draw(painter: Painter, source: SourceCache, layer: BuildingStyleLayer,
         ];
 
         const depthMode = shadowRenderer.getShadowPassDepthMode();
-        const colorMode = shadowRenderer.getShadowPassColorMode();
 
         drawTiles({
             painter,
             source,
             layer,
             coords,
             defines: definesForPass,
-            blendMode: colorMode,
+            blendMode: ColorMode.disabled,
             depthMode,
             opacity,
             verticalScale,
@@ -361,7 +360,7 @@ function draw(painter: Painter, source: SourceCache, layer: BuildingStyleLayer,
         ];
 
         if (receiveShadowsEnabled) {
-            definesForPass = definesForPass.concat("RENDER_SHADOWS", "DEPTH_TEXTURE");
+            definesForPass = definesForPass.concat("RENDER_SHADOWS");
         }
 
         if (painter.shadowRenderer && painter.shadowRenderer.useNormalOffset) {

3d-style/render/draw_model.ts

@@ -163,7 +163,7 @@ function setupMeshDraw(definesValues: Array<string>, dynamicBuffers: Array<Verte
 
     const shadowRenderer = painter.shadowRenderer;
     if (shadowRenderer) {
-        definesValues.push('RENDER_SHADOWS', 'DEPTH_TEXTURE');
+        definesValues.push('RENDER_SHADOWS');
         if (shadowRenderer.useNormalOffset) {
             definesValues.push('NORMAL_OFFSET');
         }
@@ -343,13 +343,11 @@ function drawShadowCaster(mesh: Mesh, matrix: mat4, painter: Painter, layer: Mod
     const shadowRenderer = painter.shadowRenderer;
     if (!shadowRenderer) return;
     const depthMode = shadowRenderer.getShadowPassDepthMode();
-    const colorMode = shadowRenderer.getShadowPassColorMode();
     const shadowMatrix = shadowRenderer.calculateShadowPassMatrixFromMatrix(matrix);
     const uniformValues = modelDepthUniformValues(shadowMatrix);
-    const definesValues = (painter._shadowMapDebug) ? [] : ['DEPTH_TEXTURE'];
-    const program = painter.getOrCreateProgram('modelDepth', {defines: (definesValues as DynamicDefinesType[])});
+    const program = painter.getOrCreateProgram('modelDepth');
     const context = painter.context;
-    program.draw(painter, context.gl.TRIANGLES, depthMode, StencilMode.disabled, colorMode, CullFaceMode.disabled,
+    program.draw(painter, context.gl.TRIANGLES, depthMode, StencilMode.disabled, ColorMode.disabled, CullFaceMode.disabled,
         uniformValues, layer.id, mesh.vertexBuffer, mesh.indexBuffer, mesh.segments, layer.paint, painter.transform.zoom,
         undefined, undefined);
 }
@@ -957,7 +955,7 @@ function drawInstancedNode(painter: Painter, layer: ModelStyleLayer, node: Model
             if (isShadowPass && shadowRenderer) {
                 program = painter.getOrCreateProgram('modelDepth', {defines: (definesValues as DynamicDefinesType[])});
                 uniformValues = modelDepthUniformValues(renderData.shadowTileMatrix, renderData.shadowTileMatrix, Float32Array.from(node.globalMatrix));
-                colorMode = shadowRenderer.getShadowPassColorMode();
+                colorMode = ColorMode.disabled;
             } else {
 
                 const ignoreLut = layer.paint.get('model-color-use-theme').constantOr('default') === 'none';

3d-style/render/shadow_renderer.ts

@@ -258,18 +258,11 @@ export class ShadowRenderer {
         if (this._cascades.length === 0 || shadowParameters.shadowMapResolution !== this._cascades[0].texture.size[0]) {
             this._cascades = [];
             for (let i = 0; i < shadowParameters.cascadeCount; ++i) {
-                const useColor = painter._shadowMapDebug;
-
                 const gl = context.gl;
-                const fbo = context.createFramebuffer(width, height, useColor ? 1 : 0, 'texture');
+                const fbo = context.createFramebuffer(width, height, 0, 'texture');
                 const depthTexture = new Texture(context, {width, height, data: null}, gl.DEPTH_COMPONENT16);
                 fbo.depthAttachment.set(depthTexture.texture);
 
-                if (useColor) {
-                    const colorTexture = new Texture(context, {width, height, data: null}, gl.RGBA8);
-                    fbo.colorAttachment0.set(colorTexture.texture);
-                }
-
                 this._cascades.push({
                     framebuffer: fbo,
                     texture: depthTexture,
@@ -424,7 +417,7 @@ export class ShadowRenderer {
         if (cutoffParams.shouldRenderCutoff) {
             baseDefines.push('RENDER_CUTOFF');
         }
-        baseDefines.push('RENDER_SHADOWS', 'DEPTH_TEXTURE');
+        baseDefines.push('RENDER_SHADOWS');
         if (this.useNormalOffset) {
             baseDefines.push('NORMAL_OFFSET');
         }
@@ -452,10 +445,6 @@ export class ShadowRenderer {
         }
     }
 
-    getShadowPassColorMode(): Readonly<ColorMode> {
-        return this.painter._shadowMapDebug ? ColorMode.unblended : ColorMode.disabled;
-    }
-
     getShadowPassDepthMode(): Readonly<DepthMode> {
         return this._depthMode;
     }

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

@@ -2,12 +2,17 @@
 #include "_prelude_shadow.vertex.glsl"
 
 in vec3 a_pos_3f;
-in vec3 a_normal_3;
-in vec3 a_centroid_3;
-in float a_flood_light_wall_radius_1i16;
+in ivec3 a_normal_3;
+in ivec3 a_centroid_3;
 
-in vec4 a_faux_facade_data;
-in vec2 a_faux_facade_vertical_range;
+#ifdef FLOOD_LIGHT
+in int a_flood_light_wall_radius_1i16;
+#endif
+
+#ifdef BUILDING_FAUX_FACADE
+in uvec4 a_faux_facade_data;
+in uvec2 a_faux_facade_vertical_range;
+#endif
 
 uniform mat4 u_matrix;
 uniform mat4 u_normal_matrix;
@@ -59,39 +64,40 @@ mat3 get_tbn(in vec3 normal) {
     return mat3(tangent, bitangent, normal);
 }
 #endif
-#pragma mapbox: define-attribute-vertex-shader-only highp vec2 part_color_emissive
-#pragma mapbox: define-attribute-vertex-shader-only highp vec2 faux_facade_color_emissive
+#pragma mapbox: define-attribute-vertex-shader-only highp uvec2 part_color_emissive
+#pragma mapbox: define-attribute-vertex-shader-only highp uvec2 faux_facade_color_emissive
 
 void main() {
-    #pragma mapbox: initialize-attribute-custom highp vec2 part_color_emissive
-    #pragma mapbox: initialize-attribute-custom highp vec2 faux_facade_color_emissive
+    #pragma mapbox: initialize-attribute-custom highp uvec2 part_color_emissive
+    #pragma mapbox: initialize-attribute-custom highp uvec2 faux_facade_color_emissive
 
 #ifdef FLOOD_LIGHT
-    v_flood_radius = (a_flood_light_wall_radius_1i16 / MAX_INT_16 * FLOOD_LIGHT_MAX_RADIUS_METER);
+    v_flood_radius = (float(a_flood_light_wall_radius_1i16) / MAX_INT_16 * FLOOD_LIGHT_MAX_RADIUS_METER);
     v_has_flood_light = step(0.0, v_flood_radius);
 #endif
 
-    vec4 color_emissive = decode_color(part_color_emissive);
+    vec4 color_emissive = decode_color(vec2(part_color_emissive));
     v_color = vec4(sRGBToLinear(color_emissive.rgb), color_emissive.a);
 
-    vec3 a_normal_3f = a_normal_3 / MAX_INT_16;
+    vec3 a_normal_3f = vec3(a_normal_3) / MAX_INT_16;
     v_normal = vec3(u_normal_matrix * vec4(a_normal_3f, 0.0));
 
     float hidden = 0.0;
     float depth_offset = 0.0;
 #ifdef BUILDING_FAUX_FACADE
-    v_faux_facade = a_faux_facade_data.x;
+    vec4 faux_facade_data = vec4(a_faux_facade_data);
+    v_faux_facade = faux_facade_data.x;
     if (v_faux_facade > 0.0) {
-        v_faux_facade_ed = a_faux_facade_data.x  * u_tile_to_meter;
+        v_faux_facade_ed = faux_facade_data.x  * u_tile_to_meter;
 
-        float window_x_perc = floor(a_faux_facade_data.y / TWO_POW_8);
-        float window_y_perc = a_faux_facade_data.y - TWO_POW_8 * window_x_perc;
+        float window_x_perc = floor(faux_facade_data.y / TWO_POW_8);
+        float window_y_perc = faux_facade_data.y - TWO_POW_8 * window_x_perc;
         vec2 window_perc = vec2(window_x_perc, window_y_perc) / MAX_UINT_8;
 
-        v_faux_facade_floor = (a_faux_facade_data.zw / MAX_UINT_16 * EXTENT) * u_tile_to_meter;
+        v_faux_facade_floor = (faux_facade_data.zw / MAX_UINT_16 * EXTENT) * u_tile_to_meter;
         v_faux_facade_window = window_perc * v_faux_facade_floor;
 
-        v_faux_facade_range = (a_faux_facade_vertical_range / MAX_UINT_16 * EXTENT) * u_tile_to_meter;
+        v_faux_facade_range = (vec2(a_faux_facade_vertical_range) / MAX_UINT_16 * EXTENT) * u_tile_to_meter;
 
         v_aspect = v_faux_facade_window.x / v_faux_facade_window.y;
 
@@ -100,11 +106,10 @@ void main() {
         v_tbn_1 = tbn[1];
         v_tbn_2 = tbn[2];
 
-        v_faux_color_emissive = decode_color(faux_facade_color_emissive);
+        v_faux_color_emissive = decode_color(vec2(faux_facade_color_emissive));
         v_faux_color_emissive.rgb = sRGBToLinear(v_faux_color_emissive.rgb);
 
-        float height = a_centroid_3.z;
-        depth_offset = min(1000.0, height) * 0.0000002;
+        depth_offset = min(1000.0, float(a_centroid_3.z)) * 0.0000002;
     }
 #endif
     v_pos = a_pos_3f;

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

@@ -1,6 +1,6 @@
 in vec3 a_pos_3f;
 
-#pragma mapbox: define-attribute-vertex-shader-only highp vec2 part_color_emissive
+#pragma mapbox: define-attribute-vertex-shader-only highp uvec2 part_color_emissive
 #pragma mapbox: define-attribute highp vec4 bloom_attenuation
 
 out vec4 v_color_emissive;
@@ -12,11 +12,11 @@ vec3 sRGBToLinear(vec3 srgbIn) {
 }
 
 void main() {
-    #pragma mapbox: initialize-attribute-custom highp vec2 part_color_emissive
+    #pragma mapbox: initialize-attribute-custom highp uvec2 part_color_emissive
     #pragma mapbox: initialize-attribute highp vec4 bloom_attenuation
 
 #ifdef HAS_ATTRIBUTE_a_part_color_emissive
-    vec4 color_emissive = decode_color(part_color_emissive);
+    vec4 color_emissive = decode_color(vec2(part_color_emissive));
     float part_emissive = color_emissive.a * 5.0; // The emissive value was compressed from [0,5] to [0,1]
     v_color_emissive = vec4(sRGBToLinear(color_emissive.rgb), part_emissive);
 #else

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

@@ -1,7 +1 @@
-in highp float v_depth;
-
-void main() {
-#ifndef DEPTH_TEXTURE
-    glFragColor = pack_depth(v_depth);
-#endif
-}
+void main() {}

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

@@ -1,9 +1,7 @@
 in vec3 a_pos_3f;
 
 uniform mat4 u_matrix;
-out highp float v_depth;
 
 void main() {
     gl_Position = u_matrix * vec4(a_pos_3f, 1.0);
-    v_depth = gl_Position.z / gl_Position.w;
 }

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

@@ -1,5 +1,2 @@
 void main() {
-#ifndef DEPTH_TEXTURE
-    glFragColor = vec4(0.);
-#endif
 }