chore: Upgrade to luma.gl 9.3.0-alpha.10

examples/playground/package.json

@@ -14,7 +14,6 @@
     "@loaders.gl/csv": "^4.4.0-alpha.18",
     "@loaders.gl/draco": "^4.4.0-alpha.18",
     "@loaders.gl/gltf": "^4.4.0-alpha.18",
-    "@luma.gl/constants": "^9.3.0-alpha.6",
     "deck.gl": "^9.0.0",
     "maplibre-gl": "^5.0.0",
     "monaco-editor": "^0.39.0",

examples/vite.config.local.mjs

@@ -1,3 +1,4 @@
+/* eslint-disable import/namespace */
 import {defineConfig} from 'vite';
 import {getOcularConfig} from '@vis.gl/dev-tools';
 import {join} from 'path';

modules/aggregation-layers/package.json

@@ -38,17 +38,16 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@luma.gl/constants": "^9.3.0-alpha.6",
-    "@luma.gl/shadertools": "^9.3.0-alpha.6",
+    "@luma.gl/shadertools": "^9.3.0-alpha.10",
     "@math.gl/core": "^4.1.0",
     "@math.gl/web-mercator": "^4.1.0",
     "d3-hexbin": "^0.2.1"
   },
   "peerDependencies": {
     "@deck.gl/core": "~9.2.0",
     "@deck.gl/layers": "~9.2.0",
-    "@luma.gl/core": "~9.3.0-alpha.6",
-    "@luma.gl/engine": "~9.3.0-alpha.6"
+    "@luma.gl/core": "~9.3.0-alpha.10",
+    "@luma.gl/engine": "~9.3.0-alpha.10"
   },
   "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
 }

modules/aggregation-layers/src/common/aggregator/gpu-aggregator/aggregation-transform-uniforms.ts

@@ -7,7 +7,7 @@ import {ShaderModule} from '@luma.gl/shadertools';
 import {Texture} from '@luma.gl/core';
 
 const uniformBlock = /* glsl */ `\
-uniform aggregatorTransformUniforms {
+layout(std140) uniform aggregatorTransformUniforms {
   ivec4 binIdRange;
   bvec3 isCount;
   bvec3 isMean;
@@ -19,6 +19,7 @@ export type AggregatorTransformProps = {
   binIdRange: NumberArray4;
   isCount: NumberArray3;
   isMean: NumberArray3;
+  naN: number;
   bins: Texture;
 };
 
@@ -28,6 +29,7 @@ export const aggregatorTransformUniforms = {
   uniformTypes: {
     binIdRange: 'vec4<i32>',
     isCount: 'vec3<f32>',
-    isMean: 'vec3<f32>'
+    isMean: 'vec3<f32>',
+    naN: 'f32'
   }
 } as const satisfies ShaderModule<AggregatorTransformProps>;

modules/aggregation-layers/src/common/aggregator/gpu-aggregator/bin-sorter-uniforms.ts

@@ -6,7 +6,7 @@ import {NumberArray2, NumberArray4} from '@math.gl/core';
 import {ShaderModule} from '@luma.gl/shadertools';
 
 const uniformBlock = /* glsl */ `\
-uniform binSorterUniforms {
+layout(std140) uniform binSorterUniforms {
   ivec4 binIdRange;
   ivec2 targetSize;
 } binSorter;

modules/aggregation-layers/src/contour-layer/bin-options-uniforms.ts

@@ -5,7 +5,7 @@
 import type {ShaderModule} from '@luma.gl/shadertools';
 
 const uniformBlock = /* glsl */ `\
-uniform binOptionsUniforms {
+layout(std140) uniform binOptionsUniforms {
   vec2 cellOriginCommon;
   vec2 cellSizeCommon;
 } binOptions;

modules/aggregation-layers/src/grid-layer/bin-options-uniforms.ts

@@ -5,7 +5,7 @@
 import type {ShaderModule} from '@luma.gl/shadertools';
 
 const uniformBlock = /* glsl */ `\
-uniform binOptionsUniforms {
+layout(std140) uniform binOptionsUniforms {
   vec2 cellOriginCommon;
   vec2 cellSizeCommon;
 } binOptions;

modules/aggregation-layers/src/grid-layer/grid-layer-uniforms.ts

@@ -6,7 +6,7 @@ import {Texture} from '@luma.gl/core';
 import type {ShaderModule} from '@luma.gl/shadertools';
 
 const uniformBlock = /* glsl */ `\
-uniform gridUniforms {
+layout(std140) uniform gridUniforms {
   vec4 colorDomain;
   vec4 elevationDomain;
   vec2 elevationRange;

modules/aggregation-layers/src/heatmap-layer/heatmap-layer-uniforms.ts

@@ -6,7 +6,7 @@ import {Texture} from '@luma.gl/core';
 import type {ShaderModule} from '@luma.gl/shadertools';
 
 const uniformBlock = `\
-uniform weightUniforms {
+layout(std140) uniform weightUniforms {
   vec4 commonBounds;
   float radiusPixels;
   float textureWidth;
@@ -40,7 +40,7 @@ export type MaxWeightProps = {
 export const maxWeightUniforms = {
   name: 'maxWeight',
   vs: `\
-uniform maxWeightUniforms {
+layout(std140) uniform maxWeightUniforms {
   float textureSize;
 } maxWeight;
 `,

modules/aggregation-layers/src/heatmap-layer/triangle-layer-uniforms.ts

@@ -6,7 +6,7 @@ import {Texture} from '@luma.gl/core';
 import type {ShaderModule} from '@luma.gl/shadertools';
 
 const uniformBlock = `\
-uniform triangleUniforms {
+layout(std140) uniform triangleUniforms {
   float aggregationMode;
   vec2 colorDomain;
   float intensity;

modules/aggregation-layers/src/hexagon-layer/bin-options-uniforms.ts

@@ -6,7 +6,7 @@ import type {ShaderModule} from '@luma.gl/shadertools';
 import {NumberArray2} from '@math.gl/core';
 
 const uniformBlock = /* glsl */ `\
-uniform binOptionsUniforms {
+layout(std140) uniform binOptionsUniforms {
   vec2 hexOriginCommon;
   float radiusCommon;
 } binOptions;

modules/aggregation-layers/src/hexagon-layer/hexagon-layer-uniforms.ts

@@ -6,7 +6,7 @@ import {Texture} from '@luma.gl/core';
 import type {ShaderModule} from '@luma.gl/shadertools';
 
 const uniformBlock = /* glsl */ `\
-uniform hexagonUniforms {
+layout(std140) uniform hexagonUniforms {
   vec4 colorDomain;
   vec4 elevationDomain;
   vec2 elevationRange;

modules/aggregation-layers/src/screen-grid-layer/bin-options-uniforms.ts

@@ -5,7 +5,7 @@
 import type {ShaderModule} from '@luma.gl/shadertools';
 
 const uniformBlock = /* glsl */ `\
-uniform binOptionsUniforms {
+layout(std140) uniform binOptionsUniforms {
   float cellSizePixels;
 } binOptions;
 `;

modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer-uniforms.ts

@@ -6,7 +6,7 @@ import {Texture} from '@luma.gl/core';
 import type {ShaderModule} from '@luma.gl/shadertools';
 
 const uniformBlock = /* glsl */ `\
-uniform screenGridUniforms {
+layout(std140) uniform screenGridUniforms {
   vec2 cellSizeClipspace;
   vec2 gridSizeClipspace;
   vec2 colorDomain;

modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.ts

@@ -163,7 +163,7 @@ export default class ScreenGridLayer<
 
   void getBin(out ivec2 binId) {
     vec4 pos = project_position_to_clipspace(positions, positions64Low, vec3(0.0));
-    vec2 screenCoords = vec2(pos.x / pos.w + 1.0, 1.0 - pos.y / pos.w) / 2.0 * project.viewportSize / project.devicePixelRatio;
+    vec2 screenCoords = vec2(pos.x / pos.w + 1.0, 1.0 - pos.y / pos.w) / 2.0 * project.viewportSize.xy / project.devicePixelRatio;
     vec2 gridCoords = floor(screenCoords / binOptions.cellSizePixels);
     binId = ivec2(gridCoords);
   }

modules/arcgis/package.json

@@ -36,15 +36,14 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@luma.gl/constants": "^9.3.0-alpha.6",
     "esri-loader": "^3.7.0"
   },
   "peerDependencies": {
     "@arcgis/core": "^4.0.0",
     "@deck.gl/core": "~9.2.0",
-    "@luma.gl/core": "~9.3.0-alpha.6",
-    "@luma.gl/engine": "~9.3.0-alpha.6",
-    "@luma.gl/webgl": "~9.3.0-alpha.6"
+    "@luma.gl/core": "~9.3.0-alpha.10",
+    "@luma.gl/engine": "~9.3.0-alpha.10",
+    "@luma.gl/webgl": "~9.3.0-alpha.10"
   },
   "devDependencies": {
     "@arcgis/core": "^4.21.0"

modules/arcgis/src/commons.ts

@@ -4,7 +4,7 @@
 
 /* eslint-disable no-invalid-this */
 
-import {GL} from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl/constants';
 import type {Device, Texture, Framebuffer} from '@luma.gl/core';
 import {Deck} from '@deck.gl/core';
 import {Model, Geometry} from '@luma.gl/engine';

modules/carto/package.json

@@ -49,8 +49,8 @@
     "@loaders.gl/mvt": "^4.4.0-alpha.18",
     "@loaders.gl/schema": "^4.4.0-alpha.18",
     "@loaders.gl/tiles": "^4.4.0-alpha.18",
-    "@luma.gl/core": "^9.3.0-alpha.6",
-    "@luma.gl/shadertools": "^9.3.0-alpha.6",
+    "@luma.gl/core": "^9.3.0-alpha.10",
+    "@luma.gl/shadertools": "^9.3.0-alpha.10",
     "@math.gl/web-mercator": "^4.1.0",
     "@types/d3-array": "^3.0.2",
     "@types/d3-color": "^1.4.2",
@@ -73,7 +73,7 @@
     "@deck.gl/geo-layers": "~9.2.0",
     "@deck.gl/layers": "~9.2.0",
     "@loaders.gl/core": "^4.4.0-alpha.18",
-    "@luma.gl/core": "~9.3.0-alpha.6"
+    "@luma.gl/core": "~9.3.0-alpha.10"
   },
   "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
 }

modules/carto/src/layers/heatmap-tile-layer.ts

@@ -87,7 +87,7 @@
 }
 
 const uniformBlock = `\
-uniform densityUniforms {
+layout(std140) uniform densityUniforms {
   float factor;
 } density;
 `;
@@ -233,7 +233,7 @@
     }
   }
 
   renderLayers(): Layer {
     const {
       data,
       getWeight,

modules/carto/src/layers/heatmap.ts

@@ -15,7 +15,7 @@ import {Texture} from '@luma.gl/core';
  */
 
 const fs = /* glsl */ `\
-uniform heatmapUniforms {
+layout(std140) uniform heatmapUniforms {
   vec2 colorDomain;
   vec2 delta;
   float intensity;

modules/carto/src/layers/raster-tile-layer.ts

@@ -45,6 +45,8 @@ type _RasterTileLayerProps<DataT> = Omit<RasterLayerProps<DataT>, 'data'> &
   };
 
 class PostProcessTileLayer extends PostProcessModifier(TileLayer, copy) {
+  static layerName = 'PostProcessTileLayer';
+
   filterSubLayer(context: FilterContext) {
     // Handle DrawCallbackLayer
     const {tile} = (context.layer as Layer<{tile: any}>).props;

modules/core/package.json

@@ -42,11 +42,10 @@
   "dependencies": {
     "@loaders.gl/core": "^4.4.0-alpha.18",
     "@loaders.gl/images": "^4.4.0-alpha.18",
-    "@luma.gl/constants": "^9.3.0-alpha.6",
-    "@luma.gl/core": "^9.3.0-alpha.6",
-    "@luma.gl/engine": "^9.3.0-alpha.6",
-    "@luma.gl/shadertools": "^9.3.0-alpha.6",
-    "@luma.gl/webgl": "^9.3.0-alpha.6",
+    "@luma.gl/core": "^9.3.0-alpha.10",
+    "@luma.gl/engine": "^9.3.0-alpha.10",
+    "@luma.gl/shadertools": "^9.3.0-alpha.10",
+    "@luma.gl/webgl": "^9.3.0-alpha.10",
     "@math.gl/core": "^4.1.0",
     "@math.gl/sun": "^4.1.0",
     "@math.gl/types": "^4.1.0",

modules/core/src/lib/attribute/gl-utils.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {getTypedArrayConstructor, getDataType} from '@luma.gl/core';
+import {dataTypeDecoder, getTypedArrayConstructor} from '@luma.gl/core';
 import type {BufferAttributeLayout, VertexFormat} from '@luma.gl/core';
 import type {TypedArrayConstructor} from '../../types/types';
 import type {BufferAccessor, DataColumnSettings, LogicalDataType} from './data-column';
@@ -20,7 +20,7 @@ export function typedArrayFromDataType(type: LogicalDataType): TypedArrayConstru
   }
 }
 
-export const dataTypeFromTypedArray = getDataType;
+export const dataTypeFromTypedArray = dataTypeDecoder.getDataType.bind(dataTypeDecoder);
 
 export function getBufferAttributeLayout(
   name: string,

modules/core/src/lib/deck.ts

@@ -20,7 +20,7 @@ import {luma} from '@luma.gl/core';
 import {webgl2Adapter} from '@luma.gl/webgl';
 import {Timeline} from '@luma.gl/engine';
 import {AnimationLoop} from '@luma.gl/engine';
-import {GL} from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl/constants';
 import type {CanvasContextProps, Device, DeviceProps, Framebuffer, Parameters} from '@luma.gl/core';
 import type {ShaderModule} from '@luma.gl/shadertools';
 

modules/core/src/lib/view-manager.ts

@@ -181,7 +181,7 @@ export default class ViewManager<ViewsT extends View[]> {
       typeof viewOrViewId === 'string' ? this.getView(viewOrViewId) : viewOrViewId;
     // Backward compatibility: view state for single view
     const viewState = (view && this.viewState[view.getViewStateId()]) || this.viewState;
-    return view ? view.filterViewState(viewState) : viewState;
+    return (view ? view.filterViewState(viewState) : viewState) as AnyViewStateOf<ViewsT>;
   }
 
   getViewport(viewId: string): Viewport | undefined {

modules/core/src/passes/screen-pass-uniforms.ts

@@ -6,7 +6,7 @@ import type {TextureView} from '@luma.gl/core';
 import type {ShaderModule} from '@luma.gl/shadertools';
 
 const uniformBlock = `\
-uniform screenUniforms {
+layout(std140) uniform screenUniforms {
   vec2 texSize;
 } screen;
 `;

modules/core/src/shaderlib/color/color.ts

@@ -43,9 +43,6 @@ export default {
     // TODO - v10: use raw opacity?
     // opacity: Math.pow(props.opacity!, 1 / 2.2)
     return {};
-  },
-  uniformTypes: {
-    opacity: 'f32'
   }
   // @ts-ignore TODO v9.1
 } as const satisfies ShaderModule<LayerProps, ColorUniforms, {}>;

modules/core/src/shaderlib/misc/layer-uniforms.ts

@@ -6,7 +6,7 @@ import type {ShaderModule} from '@luma.gl/shadertools';
 import type {LayerProps} from '../../types/layer-props';
 
 const uniformBlock = `\
-uniform layerUniforms {
+layout(std140) uniform layerUniforms {
   uniform float opacity;
 } layer;
 `;

modules/core/src/shaderlib/project/project.glsl.ts

@@ -20,7 +20,7 @@ ${COORDINATE_SYSTEM_GLSL_CONSTANTS}
 ${PROJECTION_MODE_GLSL_CONSTANTS}
 ${UNIT_GLSL_CONSTANTS}
 
-uniform projectUniforms {
+layout(std140) uniform projectUniforms {
   bool wrapLongitude;
   int coordinateSystem;
   vec3 commonUnitsPerMeter;

modules/core/src/shaderlib/project/project.wgsl.ts

@@ -50,7 +50,7 @@ struct ProjectUniforms {
   pseudoMeters: i32,
 };
 
-@group(0) @binding(0)
+@group(0) @binding(auto)
 var<uniform> project: ProjectUniforms;
 
 // -----------------------------------------------------------------------------

modules/core/src/shaderlib/shadow/shadow.ts

@@ -15,7 +15,7 @@ import type Viewport from '../../viewports/viewport';
 import type {ProjectProps, ProjectUniforms} from '../project/viewport-uniforms';
 
 const uniformBlock = /* glsl */ `
-uniform shadowUniforms {
+layout(std140) uniform shadowUniforms {
   bool drawShadowMap;
   bool useShadowMap;
   vec4 color;

modules/core/src/transitions/gpu-interpolation-transition.ts

@@ -6,7 +6,7 @@ import type {Device} from '@luma.gl/core';
 import {Timeline, BufferTransform} from '@luma.gl/engine';
 import {fp64arithmetic} from '@luma.gl/shadertools';
 import type {ShaderModule} from '@luma.gl/shadertools';
-import {GL} from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl/constants';
 import Attribute from '../lib/attribute/attribute';
 import {
   getAttributeTypeFromSize,
@@ -112,7 +112,7 @@ export default class GPUInterpolationTransition extends GPUTransitionBase<Interp
 }
 
 const uniformBlock = `\
-uniform interpolationUniforms {
+layout(std140) uniform interpolationUniforms {
   float time;
 } interpolation;
 `;

modules/core/src/transitions/gpu-spring-transition.ts

@@ -116,7 +116,7 @@ export default class GPUSpringTransition extends GPUTransitionBase<SpringTransit
 }
 
 const uniformBlock = `\
-uniform springUniforms {
+layout(std140) uniform springUniforms {
   float damping;
   float stiffness;
 } spring;