Raster vertex shader: do not declare uv/texcoord vertex attribute in

permutations with position-only layouts.

GitOrigin-RevId: 279f0d11ff84525239fb1e1f08db1b58e6bf43eb

Author: stephanheigl

src/render/program/raster_program.ts

@@ -19,7 +19,7 @@ import type RasterStyleLayer from '../../style/style_layer/raster_style_layer';
 const lerp = (a: number, b: number, t: number) => { return (1 - t) * a + t * b; };
 
 function computeZBiasFactor(painter: Painter) {
-    const terrainExaggeration = Math.min(painter.terrain ? painter.terrain.exaggeration() : 0.0, 2.0);
+    const terrainExaggeration =  painter.terrain ? painter.terrain.exaggeration() : 1.0;
     const bias = painter.transform.pitch < 15.0 ? lerp(0.07, 0.7, clamp((14.0 - painter.transform.zoom) / (14.0 - 9.0), 0.0, 1.0)) : 0.07;
     return bias * terrainExaggeration;
 }

src/shaders/raster.vertex.glsl

@@ -51,14 +51,14 @@ void main() {
     v_fog_pos = fog_position((u_normalize_matrix * vec4(a_globe_pos, 1.0)).xyz);
 #endif // FOG
 #else // else GLOBE_POLES
-    float w = 1.0 + dot(a_texture_pos, u_perspective_transform);
+vec4 world_pos;
+#ifdef PROJECTION_GLOBE_VIEW
     // We are using Int16 for texture position coordinates to give us enough precision for
     // fractional coordinates. We use 8192 to scale the texture coordinates in the buffer
     // as an arbitrarily high number to preserve adequate precision when rendering.
     // This is also the same value as the EXTENT we are using for our tile buffer pos coordinates,
     // so math for modifying either is consistent.
     uv = a_texture_pos / 8192.0;
-#ifdef PROJECTION_GLOBE_VIEW
 
     vec3 decomposed_pos_and_skirt = decomposeToPosAndSkirt(a_pos);
     vec3 latLng = u_grid_matrix * vec3(decomposed_pos_and_skirt.xy, 1.0);
@@ -100,9 +100,7 @@ void main() {
     globe_pos += normalize(globe_pos) * ele * GLOBE_UPSCALE;
     vec4 globe_world_pos = u_globe_matrix * vec4(globe_pos, 1.0);
 
-    vec4 interpolated_pos = vec4(mix(globe_world_pos.xyz, merc_world_pos.xyz, u_zoom_transition) * w, w);
-
-    gl_Position = u_matrix * interpolated_pos;
+    world_pos = vec4(mix(globe_world_pos.xyz, merc_world_pos.xyz, u_zoom_transition), 1.0);
 #ifdef FOG
     v_fog_pos = fog_position((u_normalize_matrix * vec4(globe_pos, 1.0)).xyz);
 #endif // FOG
@@ -115,12 +113,16 @@ void main() {
     decodedPos = decomposedPosAndSkirt.xy;
     uv = decodedPos / 8192.0;
     ele = elevation(decodedPos) - skirt;
+#else // else ELEVATION_REFERENCE_GROUND
+    uv = a_texture_pos / 8192.0;
 #endif // ELEVATION_REFERENCE_GROUND
-    gl_Position = u_matrix * vec4(decodedPos * w, (u_raster_elevation + ele) * w, w);
+    world_pos = vec4(decodedPos, (u_raster_elevation + ele), 1.0);
 #ifdef FOG
     v_fog_pos = fog_position(decodedPos);
 #endif // FOG
 #endif // else PROJECTION_GLOBE_VIEW
+    float w = 1.0 + dot(uv*EXTENT, u_perspective_transform);
+    gl_Position = u_matrix * world_pos * w;
 #endif // else GLOBE_POLES
 
     v_pos0 = uv;

test/integration/render-tests/raster-elevation-tiled/terrain-ground-reference-globe/expected.png

@@ -0,0 +1,97 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 300,
+      "width": 512,
+      "allowed": 0.0013,
+      "operations": [
+        [
+          "wait"
+        ]
+      ]
+    }
+  },
+  "projection": {
+    "name": "globe"
+  }, 
+  "center": [
+    -107.616,
+    41.166
+  ],
+  "zoom": 5.18,
+  "pitch": 32.0,
+  "bearing": -100.5,
+  "terrain": {
+    "source": "rgbterrain",
+    "exaggeration": 100.0
+  },
+  "sprite": "local://sprites/standard",
+  "lights": [
+    {
+      "type": "ambient",
+      "id": "test_ambient",
+      "properties": {
+        "color": "rgba(255, 255, 255, 1)",
+        "intensity": 0.2
+      }
+    },
+    {
+      "type": "directional",
+      "id": "test_directional",
+      "properties": {
+        "cast-shadows": true,
+        "color": "rgba(255, 255, 255, 1)",
+        "intensity": 0.8
+      }
+    }
+  ],
+  "sources": {
+    "rgbterrain": {
+      "type": "raster-dem",
+      "tiles": [
+        "local://tiles/{z}-{x}-{y}.terrain.512.png"
+      ],
+      "maxzoom": 12,
+      "tileSize": 512
+    },
+    "satellite": {
+      "type": "raster",
+      "tiles": [
+        "local://tiles/{z}-{x}-{y}.satellite.png"
+      ],
+      "maxzoom": 17,
+      "tileSize": 256
+    },
+    "image": {
+      "type": "raster",
+      "tiles": [
+        "local://tiles/alpha.png"
+      ],
+      "maxzoom": 17,
+      "tileSize": 256
+    }
+  },
+  "layers": [
+    {
+      "id": "raster",
+      "type": "raster",
+      "source": "satellite",
+      "paint": {
+        "raster-fade-duration": 0
+      }
+    },
+    {
+      "id": "image",
+      "type": "raster",
+      "source": "image",
+      "paint": {
+        "raster-fade-duration": 0,
+        "raster-opacity": 0.7,
+        "raster-elevation": 10.0,
+        "raster-elevation-reference": "ground",
+        "raster-emissive-strength": 1
+      }
+    }
+  ]
+}

test/integration/render-tests/raster-elevation-tiled/terrain-ground-reference-globe/style.json

@@ -57,7 +57,7 @@
     "image": {
       "type": "raster",
       "tiles": [
-        "local://tiles/const/13-4095-4095.color.png"
+        "local://tiles/alpha.png"
       ],
       "maxzoom": 17,
       "tileSize": 256