@deck.gl/aggregation-layers 9.0.34 → 9.1.0-beta.1

package/dist/index.d.ts

@@ -1,20 +1,14 @@
 export { default as ScreenGridLayer } from "./screen-grid-layer/screen-grid-layer.js";
-export { default as CPUGridLayer } from "./cpu-grid-layer/cpu-grid-layer.js";
 export { default as HexagonLayer } from "./hexagon-layer/hexagon-layer.js";
 export { default as ContourLayer } from "./contour-layer/contour-layer.js";
 export { default as GridLayer } from "./grid-layer/grid-layer.js";
-export { default as GPUGridLayer } from "./gpu-grid-layer/gpu-grid-layer.js";
-export { AGGREGATION_OPERATION } from "./utils/aggregation-operation-utils.js";
 export { default as HeatmapLayer } from "./heatmap-layer/heatmap-layer.js";
-export { default as _GPUGridAggregator } from "./utils/gpu-grid-aggregation/gpu-grid-aggregator.js";
-export { default as _CPUAggregator } from "./utils/cpu-aggregator.js";
-export { default as _AggregationLayer } from "./aggregation-layer.js";
-export { default as _BinSorter } from "./utils/bin-sorter.js";
-export type { ContourLayerProps } from "./contour-layer/contour-layer.js";
+export { default as _AggregationLayer } from "./common/aggregation-layer.js";
+export { WebGLAggregator, CPUAggregator } from "./common/aggregator/index.js";
+export type { ContourLayerProps, ContourLayerPickingInfo } from "./contour-layer/contour-layer.js";
 export type { HeatmapLayerProps } from "./heatmap-layer/heatmap-layer.js";
-export type { HexagonLayerProps } from "./hexagon-layer/hexagon-layer.js";
-export type { CPUGridLayerProps } from "./cpu-grid-layer/cpu-grid-layer.js";
-export type { GridLayerProps } from "./grid-layer/grid-layer.js";
-export type { GPUGridLayerProps } from "./gpu-grid-layer/gpu-grid-layer.js";
-export type { ScreenGridLayerProps } from "./screen-grid-layer/screen-grid-layer.js";
+export type { HexagonLayerProps, HexagonLayerPickingInfo } from "./hexagon-layer/hexagon-layer.js";
+export type { GridLayerProps, GridLayerPickingInfo } from "./grid-layer/grid-layer.js";
+export type { ScreenGridLayerProps, ScreenGridLayerPickingInfo } from "./screen-grid-layer/screen-grid-layer.js";
+export type { Aggregator, AggregationOperation, AggregationProps, WebGLAggregatorProps, CPUAggregatorProps } from "./common/aggregator/index.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,iDAA8C;AACjF,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,2CAAwC;AACxE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,yCAAsC;AACtE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,yCAAsC;AACtE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,mCAAgC;AAC7D,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,2CAAwC;AACxE,OAAO,EAAC,qBAAqB,EAAC,+CAA4C;AAG1E,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,yCAAsC;AACtE,OAAO,EAAC,OAAO,IAAI,kBAAkB,EAAC,4DAAyD;AAC/F,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,kCAA+B;AACjE,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,+BAA4B;AACjE,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,8BAA2B;AAGzD,YAAY,EAAC,iBAAiB,EAAC,yCAAsC;AACrE,YAAY,EAAC,iBAAiB,EAAC,yCAAsC;AACrE,YAAY,EAAC,iBAAiB,EAAC,yCAAsC;AACrE,YAAY,EAAC,iBAAiB,EAAC,2CAAwC;AACvE,YAAY,EAAC,cAAc,EAAC,mCAAgC;AAC5D,YAAY,EAAC,iBAAiB,EAAC,2CAAwC;AACvE,YAAY,EAAC,oBAAoB,EAAC,iDAA8C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,iDAA8C;AACjF,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,yCAAsC;AACtE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,yCAAsC;AACtE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,mCAAgC;AAC7D,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,yCAAsC;AAEtE,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,sCAAmC;AACxE,OAAO,EAAC,eAAe,EAAE,aAAa,EAAC,qCAAkC;AAGzE,YAAY,EAAC,iBAAiB,EAAE,uBAAuB,EAAC,yCAAsC;AAC9F,YAAY,EAAC,iBAAiB,EAAC,yCAAsC;AACrE,YAAY,EAAC,iBAAiB,EAAE,uBAAuB,EAAC,yCAAsC;AAC9F,YAAY,EAAC,cAAc,EAAE,oBAAoB,EAAC,mCAAgC;AAClF,YAAY,EACV,oBAAoB,EACpB,0BAA0B,EAC3B,iDAA8C;AAE/C,YAAY,EACV,UAAU,EACV,oBAAoB,EACpB,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EACnB,qCAAkC"}

package/dist/index.js

@@ -1,32 +1,10 @@
-// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 export { default as ScreenGridLayer } from "./screen-grid-layer/screen-grid-layer.js";
-export { default as CPUGridLayer } from "./cpu-grid-layer/cpu-grid-layer.js";
 export { default as HexagonLayer } from "./hexagon-layer/hexagon-layer.js";
 export { default as ContourLayer } from "./contour-layer/contour-layer.js";
 export { default as GridLayer } from "./grid-layer/grid-layer.js";
-export { default as GPUGridLayer } from "./gpu-grid-layer/gpu-grid-layer.js";
-export { AGGREGATION_OPERATION } from "./utils/aggregation-operation-utils.js";
-// experimental export
 export { default as HeatmapLayer } from "./heatmap-layer/heatmap-layer.js";
-export { default as _GPUGridAggregator } from "./utils/gpu-grid-aggregation/gpu-grid-aggregator.js";
-export { default as _CPUAggregator } from "./utils/cpu-aggregator.js";
-export { default as _AggregationLayer } from "./aggregation-layer.js";
-export { default as _BinSorter } from "./utils/bin-sorter.js";
+export { default as _AggregationLayer } from "./common/aggregation-layer.js";
+export { WebGLAggregator, CPUAggregator } from "./common/aggregator/index.js";

package/dist/screen-grid-layer/bin-options-uniforms.d.ts

@@ -0,0 +1,11 @@
+export type BinOptions = {
+    cellSizePixels: number;
+};
+export declare const binOptionsUniforms: {
+    readonly name: "binOptions";
+    readonly vs: "uniform binOptionsUniforms {\n  float cellSizePixels;\n} binOptions;\n";
+    readonly uniformTypes: {
+        readonly cellSizePixels: "f32";
+    };
+};
+//# sourceMappingURL=bin-options-uniforms.d.ts.map

package/dist/screen-grid-layer/bin-options-uniforms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bin-options-uniforms.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/bin-options-uniforms.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;;;;CAMc,CAAC"}

package/dist/screen-grid-layer/bin-options-uniforms.js

@@ -0,0 +1,15 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+const uniformBlock = /* glsl */ `\
+uniform binOptionsUniforms {
+  float cellSizePixels;
+} binOptions;
+`;
+export const binOptionsUniforms = {
+    name: 'binOptions',
+    vs: uniformBlock,
+    uniformTypes: {
+        cellSizePixels: 'f32'
+    }
+};

package/dist/screen-grid-layer/screen-grid-cell-layer.d.ts

@@ -1,19 +1,21 @@
 import { Texture } from '@luma.gl/core';
 import { Model } from '@luma.gl/engine';
-import { Layer, LayerProps, UpdateParameters, DefaultProps } from '@deck.gl/core';
-import type { _ScreenGridLayerProps } from "./screen-grid-layer.js";
+import { Layer, UpdateParameters, Color } from '@deck.gl/core';
 import { ShaderModule } from '@luma.gl/shadertools';
-/** All properties supported by ScreenGridCellLayer. */
-export type ScreenGridCellLayerProps<DataT = unknown> = _ScreenGridCellLayerProps<DataT> & LayerProps;
+import type { ScaleType } from "../common/types.js";
 /** Proprties added by ScreenGridCellLayer. */
-export type _ScreenGridCellLayerProps<DataT> = _ScreenGridLayerProps<DataT> & {
-    maxTexture: Texture;
+export type _ScreenGridCellLayerProps = {
+    cellSizePixels: number;
+    cellMarginPixels: number;
+    colorScaleType: ScaleType;
+    colorDomain: () => [number, number];
+    colorRange?: Color[];
 };
-export default class ScreenGridCellLayer<DataT = any, ExtraPropsT extends {} = {}> extends Layer<ExtraPropsT & Required<_ScreenGridCellLayerProps<DataT>>> {
+export default class ScreenGridCellLayer<ExtraPropsT extends {} = {}> extends Layer<ExtraPropsT & Required<_ScreenGridCellLayerProps>> {
     static layerName: string;
-    static defaultProps: DefaultProps<ScreenGridCellLayerProps<unknown>>;
     state: {
         model?: Model;
+        colorTexture: Texture;
     };
     getShaders(): {
         vs: string;
@@ -21,18 +23,11 @@ export default class ScreenGridCellLayer<DataT = any, ExtraPropsT extends {} = {
         modules: ShaderModule[];
     };
     initializeState(): void;
-    shouldUpdateState({ changeFlags }: {
-        changeFlags: any;
-    }): any;
     updateState(params: UpdateParameters<this>): void;
+    finalizeState(context: any): void;
     draw({ uniforms }: {
         uniforms: any;
     }): void;
-    calculateInstancePositions(attribute: any, { numInstances }: {
-        numInstances: any;
-    }): void;
     _getModel(): Model;
-    _shouldUseMinMax(): boolean;
-    _updateUniforms(oldProps: any, props: any, changeFlags: any): void;
 }
 //# sourceMappingURL=screen-grid-cell-layer.d.ts.map

package/dist/screen-grid-layer/screen-grid-cell-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"screen-grid-cell-layer.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/screen-grid-cell-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,KAAK,EAAW,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,KAAK,EAAE,UAAU,EAAgB,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAI9F,OAAO,KAAK,EAAC,qBAAqB,EAAC,+BAA4B;AAC/D,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAclD,uDAAuD;AACvD,MAAM,MAAM,wBAAwB,CAAC,KAAK,GAAG,OAAO,IAAI,yBAAyB,CAAC,KAAK,CAAC,GACtF,UAAU,CAAC;AAEb,8CAA8C;AAC9C,MAAM,MAAM,yBAAyB,CAAC,KAAK,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAAG;IAC5E,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,mBAAmB,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,KAAK,CAC9F,WAAW,GAAG,QAAQ,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CACzD;IACC,MAAM,CAAC,SAAS,SAAyB;IACzC,MAAM,CAAC,YAAY,kDAAgB;IAEnC,KAAK,EAAG;QACN,KAAK,CAAC,EAAE,KAAK,CAAC;KACf,CAAC;IAEF,UAAU,IAAI;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,YAAY,EAAE,CAAA;KAAC;IAI/D,eAAe;IAYf,iBAAiB,CAAC,EAAC,WAAW,EAAC;;KAAA;IAK/B,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAe1C,IAAI,CAAC,EAAC,QAAQ,EAAC;;KAAA;IA6Bf,0BAA0B,CAAC,SAAS,KAAA,EAAE,EAAC,YAAY,EAAC;;KAAA;IAkBpD,SAAS,IAAI,KAAK;IAuBlB,gBAAgB,IAAI,OAAO;IAe3B,eAAe,CAAC,QAAQ,KAAA,EAAE,KAAK,KAAA,EAAE,WAAW,KAAA,GAAG,IAAI;CA4BpD"}
+{"version":3,"file":"screen-grid-cell-layer.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/screen-grid-cell-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,KAAK,EAAW,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,KAAK,EAAW,gBAAgB,EAAgB,KAAK,EAAC,MAAM,eAAe,CAAC;AAKpF,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAC,SAAS,EAAC,2BAAwB;AAE/C,8CAA8C;AAC9C,MAAM,MAAM,yBAAyB,GAAG;IACtC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,SAAS,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC;CACtB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,mBAAmB,CAAC,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,KAAK,CACjF,WAAW,GAAG,QAAQ,CAAC,yBAAyB,CAAC,CAClD;IACC,MAAM,CAAC,SAAS,SAAyB;IAEzC,KAAK,EAAG;QACN,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;IAEF,UAAU,IAAI;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,YAAY,EAAE,CAAA;KAAC;IAI/D,eAAe;IAiBf,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAoC1C,aAAa,CAAC,OAAO,KAAA;IAMrB,IAAI,CAAC,EAAC,QAAQ,EAAC;;KAAA;IAWf,SAAS,IAAI,KAAK;CAiBnB"}

package/dist/screen-grid-layer/screen-grid-cell-layer.js

@@ -1,107 +1,68 @@
-// Copyright (c) 2015 - 2019 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { Model, Geometry } from '@luma.gl/engine';
-import { Layer, log, picking } from '@deck.gl/core';
-import { defaultColorRange, colorRangeToFlatArray } from "../utils/color-utils.js";
+import { Layer, picking } from '@deck.gl/core';
+import { createColorRangeTexture, updateColorRangeTexture } from "../common/utils/color-utils.js";
 import vs from "./screen-grid-layer-vertex.glsl.js";
 import fs from "./screen-grid-layer-fragment.glsl.js";
-const DEFAULT_MINCOLOR = [0, 0, 0, 0];
-const DEFAULT_MAXCOLOR = [0, 255, 0, 255];
-const COLOR_PROPS = ['minColor', 'maxColor', 'colorRange', 'colorDomain'];
-const defaultProps = {
-    cellSizePixels: { type: 'number', value: 100, min: 1 },
-    cellMarginPixels: { type: 'number', value: 2, min: 0, max: 5 },
-    colorDomain: null,
-    colorRange: defaultColorRange
-};
+import { screenGridUniforms } from "./screen-grid-layer-uniforms.js";
 class ScreenGridCellLayer extends Layer {
     getShaders() {
-        return { vs, fs, modules: [picking] };
+        return super.getShaders({ vs, fs, modules: [picking, screenGridUniforms] });
     }
     initializeState() {
-        const attributeManager = this.getAttributeManager();
-        attributeManager.addInstanced({
-            // eslint-disable-next-line @typescript-eslint/unbound-method
-            instancePositions: { size: 3, update: this.calculateInstancePositions },
-            instanceCounts: { size: 4, noAlloc: true }
+        this.getAttributeManager().addInstanced({
+            instancePositions: {
+                size: 2,
+                type: 'float32',
+                accessor: 'getBin'
+            },
+            instanceWeights: {
+                size: 1,
+                type: 'float32',
+                accessor: 'getWeight'
+            }
         });
-        this.setState({
-            model: this._getModel()
-        });
-    }
-    shouldUpdateState({ changeFlags }) {
-        // 'instanceCounts' buffer contetns change on viewport change.
-        return changeFlags.somethingChanged;
+        this.state.model = this._getModel();
     }
     updateState(params) {
         super.updateState(params);
-        const { oldProps, props, changeFlags } = params;
-        const attributeManager = this.getAttributeManager();
-        if (props.numInstances !== oldProps.numInstances) {
-            attributeManager.invalidateAll();
+        const { props, oldProps, changeFlags } = params;
+        const model = this.state.model;
+        if (oldProps.colorRange !== props.colorRange) {
+            this.state.colorTexture?.destroy();
+            this.state.colorTexture = createColorRangeTexture(this.context.device, props.colorRange, props.colorScaleType);
+            const screenGridProps = { colorRange: this.state.colorTexture };
+            model.shaderInputs.setProps({ screenGrid: screenGridProps });
         }
-        else if (oldProps.cellSizePixels !== props.cellSizePixels) {
-            attributeManager.invalidate('instancePositions');
+        else if (oldProps.colorScaleType !== props.colorScaleType) {
+            updateColorRangeTexture(this.state.colorTexture, props.colorScaleType);
+        }
+        if (oldProps.cellMarginPixels !== props.cellMarginPixels ||
+            oldProps.cellSizePixels !== props.cellSizePixels ||
+            changeFlags.viewportChanged) {
+            const { width, height } = this.context.viewport;
+            const { cellSizePixels: gridSize, cellMarginPixels } = this.props;
+            const cellSize = Math.max(gridSize - cellMarginPixels, 0);
+            const screenGridProps = {
+                gridSizeClipspace: [(gridSize / width) * 2, (gridSize / height) * 2],
+                cellSizeClipspace: [(cellSize / width) * 2, (cellSize / height) * 2]
+            };
+            model.shaderInputs.setProps({ screenGrid: screenGridProps });
         }
-        this._updateUniforms(oldProps, props, changeFlags);
+    }
+    finalizeState(context) {
+        super.finalizeState(context);
+        this.state.colorTexture?.destroy();
     }
     draw({ uniforms }) {
-        const { parameters, maxTexture } = this.props;
-        const minColor = this.props.minColor || DEFAULT_MINCOLOR;
-        const maxColor = this.props.maxColor || DEFAULT_MAXCOLOR;
-        // If colorDomain not specified we use default domain [1, maxCount]
-        // maxCount value will be sampled form maxTexture in vertex shader.
-        const colorDomain = this.props.colorDomain || [1, 0];
+        const colorDomain = this.props.colorDomain();
         const model = this.state.model;
-        model.setUniforms(uniforms);
-        model.setBindings({
-            maxTexture
-        });
-        model.setUniforms({
-            // @ts-expect-error stricter luma gl types
-            minColor,
-            // @ts-expect-error stricter luma gl types
-            maxColor,
-            colorDomain
-        });
-        model.setParameters({
-            depthWriteEnabled: false,
-            // How to specify depth mask in WebGPU?
-            // depthMask: false,
-            ...parameters
-        });
+        const screenGridProps = { colorDomain };
+        model.shaderInputs.setProps({ screenGrid: screenGridProps });
         model.draw(this.context.renderPass);
     }
-    calculateInstancePositions(attribute, { numInstances }) {
-        const { width, height } = this.context.viewport;
-        const { cellSizePixels } = this.props;
-        const numCol = Math.ceil(width / cellSizePixels);
-        const { value, size } = attribute;
-        for (let i = 0; i < numInstances; i++) {
-            const x = i % numCol;
-            const y = Math.floor(i / numCol);
-            value[i * size + 0] = ((x * cellSizePixels) / width) * 2 - 1;
-            value[i * size + 1] = 1 - ((y * cellSizePixels) / height) * 2;
-            value[i * size + 2] = 0;
-        }
-    }
     // Private Methods
     _getModel() {
         return new Model(this.context.device, {
@@ -109,60 +70,17 @@ class ScreenGridCellLayer extends Layer {
             id: this.props.id,
             bufferLayout: this.getAttributeManager().getBufferLayouts(),
             geometry: new Geometry({
-                topology: 'triangle-list',
+                topology: 'triangle-strip',
                 attributes: {
-                    // prettier-ignore
-                    positions: new Float32Array([
-                        0, 0, 0,
-                        1, 0, 0,
-                        1, 1, 0,
-                        0, 0, 0,
-                        1, 1, 0,
-                        0, 1, 0,
-                    ])
+                    positions: {
+                        value: new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]),
+                        size: 2
+                    }
                 }
             }),
             isInstanced: true
         });
     }
-    _shouldUseMinMax() {
-        const { minColor, maxColor, colorDomain, colorRange } = this.props;
-        if (minColor || maxColor) {
-            log.deprecated('ScreenGridLayer props: minColor and maxColor', 'colorRange, colorDomain')();
-            return true;
-        }
-        // minColor and maxColor not supplied, check if colorRange or colorDomain supplied.
-        // NOTE: colorDomain and colorRange are experimental features, use them only when supplied.
-        if (colorDomain || colorRange) {
-            return false;
-        }
-        // None specified, use default minColor and maxColor
-        return true;
-    }
-    _updateUniforms(oldProps, props, changeFlags) {
-        const model = this.state.model;
-        if (COLOR_PROPS.some(key => oldProps[key] !== props[key])) {
-            model.setUniforms({ shouldUseMinMax: this._shouldUseMinMax() });
-        }
-        if (oldProps.colorRange !== props.colorRange) {
-            model.setUniforms({ colorRange: colorRangeToFlatArray(props.colorRange) });
-        }
-        if (oldProps.cellMarginPixels !== props.cellMarginPixels ||
-            oldProps.cellSizePixels !== props.cellSizePixels ||
-            changeFlags.viewportChanged) {
-            const { width, height } = this.context.viewport;
-            const { cellSizePixels, cellMarginPixels } = this.props;
-            const margin = cellSizePixels > cellMarginPixels ? cellMarginPixels : 0;
-            const cellScale = new Float32Array([
-                ((cellSizePixels - margin) / width) * 2,
-                (-(cellSizePixels - margin) / height) * 2,
-                1
-            ]);
-            // @ts-expect-error stricter luma gl types
-            model.setUniforms({ cellScale });
-        }
-    }
 }
 ScreenGridCellLayer.layerName = 'ScreenGridCellLayer';
-ScreenGridCellLayer.defaultProps = defaultProps;
 export default ScreenGridCellLayer;

package/dist/screen-grid-layer/screen-grid-layer-fragment.glsl.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "#version 300 es\n#define SHADER_NAME screen-grid-layer-fragment-shader\n\nprecision highp float;\n\nin vec4 vColor;\nin float vSampleCount;\n\nout vec4 fragColor;\n\nvoid main(void) {\n  if (vSampleCount <= 0.0) {\n    discard;\n  }\n  fragColor = vColor;\n\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
+declare const _default: "#version 300 es\n#define SHADER_NAME screen-grid-layer-fragment-shader\n\nprecision highp float;\n\nin vec4 vColor;\n\nout vec4 fragColor;\n\nvoid main(void) {\n  fragColor = vColor;\n\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
 export default _default;
 //# sourceMappingURL=screen-grid-layer-fragment.glsl.d.ts.map

package/dist/screen-grid-layer/screen-grid-layer-fragment.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"screen-grid-layer-fragment.glsl.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/screen-grid-layer-fragment.glsl.ts"],"names":[],"mappings":";AAqBA,wBAmBE"}
+{"version":3,"file":"screen-grid-layer-fragment.glsl.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/screen-grid-layer-fragment.glsl.ts"],"names":[],"mappings":";AAKA,wBAeE"}

package/dist/screen-grid-layer/screen-grid-layer-fragment.glsl.js

@@ -1,34 +1,14 @@
-// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 /* fragment shader for the grid-layer */
-export default `\
+export default /* glsl */ `\
 #version 300 es
 #define SHADER_NAME screen-grid-layer-fragment-shader
 precision highp float;
 in vec4 vColor;
-in float vSampleCount;
 out vec4 fragColor;
 void main(void) {
-if (vSampleCount <= 0.0) {
-discard;
-}
 fragColor = vColor;
 DECKGL_FILTER_COLOR(fragColor, geometry);
 }

package/dist/screen-grid-layer/screen-grid-layer-uniforms.d.ts

@@ -0,0 +1,17 @@
+import { Texture } from '@luma.gl/core';
+export type ScreenGridProps = {
+    cellSizeClipspace: [number, number];
+    gridSizeClipspace: [number, number];
+    colorDomain: [number, number];
+    colorRange: Texture;
+};
+export declare const screenGridUniforms: {
+    readonly name: "screenGrid";
+    readonly vs: "uniform screenGridUniforms {\n  vec2 cellSizeClipspace;\n  vec2 gridSizeClipspace;\n  vec2 colorDomain;\n} screenGrid;\n";
+    readonly uniformTypes: {
+        readonly cellSizeClipspace: "vec2<f32>";
+        readonly gridSizeClipspace: "vec2<f32>";
+        readonly colorDomain: "vec2<f32>";
+    };
+};
+//# sourceMappingURL=screen-grid-layer-uniforms.d.ts.map

package/dist/screen-grid-layer/screen-grid-layer-uniforms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"screen-grid-layer-uniforms.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/screen-grid-layer-uniforms.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAWtC,MAAM,MAAM,eAAe,GAAG;IAC5B,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;;;;;;CAQmB,CAAC"}

package/dist/screen-grid-layer/screen-grid-layer-uniforms.js

@@ -0,0 +1,19 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+const uniformBlock = /* glsl */ `\
+uniform screenGridUniforms {
+  vec2 cellSizeClipspace;
+  vec2 gridSizeClipspace;
+  vec2 colorDomain;
+} screenGrid;
+`;
+export const screenGridUniforms = {
+    name: 'screenGrid',
+    vs: uniformBlock,
+    uniformTypes: {
+        cellSizeClipspace: 'vec2<f32>',
+        gridSizeClipspace: 'vec2<f32>',
+        colorDomain: 'vec2<f32>'
+    }
+};

package/dist/screen-grid-layer/screen-grid-layer-vertex.glsl.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "#version 300 es\n#define SHADER_NAME screen-grid-layer-vertex-shader\n#define RANGE_COUNT 6\n\nin vec3 positions;\nin vec3 instancePositions;\nin vec4 instanceCounts;\nin vec3 instancePickingColors;\n\nuniform float opacity;\nuniform vec3 cellScale;\nuniform vec4 minColor;\nuniform vec4 maxColor;\nuniform vec4 colorRange[RANGE_COUNT];\nuniform vec2 colorDomain;\nuniform bool shouldUseMinMax;\nuniform sampler2D maxTexture;\n\nout vec4 vColor;\nout float vSampleCount;\n\nvec4 quantizeScale(vec2 domain, vec4 range[RANGE_COUNT], float value) {\n  vec4 outColor = vec4(0., 0., 0., 0.);\n  if (value >= domain.x && value <= domain.y) {\n    float domainRange = domain.y - domain.x;\n    if (domainRange <= 0.) {\n      outColor = colorRange[0];\n    } else {\n      float rangeCount = float(RANGE_COUNT);\n      float rangeStep = domainRange / rangeCount;\n      float idx = floor((value - domain.x) / rangeStep);\n      idx = clamp(idx, 0., rangeCount - 1.);\n      int intIdx = int(idx);\n      outColor = colorRange[intIdx];\n    }\n  }\n  outColor = outColor / 255.;\n  return outColor;\n}\n\nvoid main(void) {\n  vSampleCount = instanceCounts.a;\n\n  float weight = instanceCounts.r;\n  float maxWeight = texture(maxTexture, vec2(0.5)).r;\n\n  float step = weight / maxWeight;\n  vec4 minMaxColor = mix(minColor, maxColor, step) / 255.;\n\n  vec2 domain = colorDomain;\n  float domainMaxValid = float(colorDomain.y != 0.);\n  domain.y = mix(maxWeight, colorDomain.y, domainMaxValid);\n  vec4 rangeColor = quantizeScale(domain, colorRange, weight);\n\n  float rangeMinMax = float(shouldUseMinMax);\n  vec4 color = mix(rangeColor, minMaxColor, rangeMinMax);\n  vColor = vec4(color.rgb, color.a * opacity);\n\n  // Set color to be rendered to picking fbo (also used to check for selection highlight).\n  picking_setPickingColor(instancePickingColors);\n\n  gl_Position = vec4(instancePositions + positions * cellScale, 1.);\n}\n";
+declare const _default: "#version 300 es\n#define SHADER_NAME screen-grid-layer-vertex-shader\n#define RANGE_COUNT 6\n\nin vec2 positions;\nin vec2 instancePositions;\nin float instanceWeights;\nin vec3 instancePickingColors;\n\nuniform sampler2D colorRange;\n\nout vec4 vColor;\n\nvec4 interp(float value, vec2 domain, sampler2D range) {\n  float r = (value - domain.x) / (domain.y - domain.x);\n  return texture(range, vec2(r, 0.5));\n}\n\nvoid main(void) {\n  if (isnan(instanceWeights)) {\n    gl_Position = vec4(0.);\n    return;\n  }\n\n  vec2 pos = instancePositions * screenGrid.gridSizeClipspace + positions * screenGrid.cellSizeClipspace;\n  pos.x = pos.x - 1.0;\n  pos.y = 1.0 - pos.y;\n\n  gl_Position = vec4(pos, 0., 1.);\n\n  vColor = interp(instanceWeights, screenGrid.colorDomain, colorRange);\n  vColor.a *= layer.opacity;\n\n  // Set color to be rendered to picking fbo (also used to check for selection highlight).\n  picking_setPickingColor(instancePickingColors);\n}\n";
 export default _default;
 //# sourceMappingURL=screen-grid-layer-vertex.glsl.d.ts.map

package/dist/screen-grid-layer/screen-grid-layer-vertex.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"screen-grid-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/screen-grid-layer-vertex.glsl.ts"],"names":[],"mappings":";AAoBA,wBAgEE"}
+{"version":3,"file":"screen-grid-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/screen-grid-layer-vertex.glsl.ts"],"names":[],"mappings":";AAIA,wBAqCE"}

package/dist/screen-grid-layer/screen-grid-layer-vertex.glsl.js

@@ -1,72 +1,31 @@
-// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-export default `\
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+export default /* glsl */ `\
 #version 300 es
 #define SHADER_NAME screen-grid-layer-vertex-shader
 #define RANGE_COUNT 6
-in vec3 positions;
-in vec3 instancePositions;
-in vec4 instanceCounts;
+in vec2 positions;
+in vec2 instancePositions;
+in float instanceWeights;
 in vec3 instancePickingColors;
-uniform float opacity;
-uniform vec3 cellScale;
-uniform vec4 minColor;
-uniform vec4 maxColor;
-uniform vec4 colorRange[RANGE_COUNT];
-uniform vec2 colorDomain;
-uniform bool shouldUseMinMax;
-uniform sampler2D maxTexture;
+uniform sampler2D colorRange;
 out vec4 vColor;
-out float vSampleCount;
-vec4 quantizeScale(vec2 domain, vec4 range[RANGE_COUNT], float value) {
-vec4 outColor = vec4(0., 0., 0., 0.);
-if (value >= domain.x && value <= domain.y) {
-float domainRange = domain.y - domain.x;
-if (domainRange <= 0.) {
-outColor = colorRange[0];
-} else {
-float rangeCount = float(RANGE_COUNT);
-float rangeStep = domainRange / rangeCount;
-float idx = floor((value - domain.x) / rangeStep);
-idx = clamp(idx, 0., rangeCount - 1.);
-int intIdx = int(idx);
-outColor = colorRange[intIdx];
-}
-}
-outColor = outColor / 255.;
-return outColor;
+vec4 interp(float value, vec2 domain, sampler2D range) {
+float r = (value - domain.x) / (domain.y - domain.x);
+return texture(range, vec2(r, 0.5));
 }
 void main(void) {
-vSampleCount = instanceCounts.a;
-float weight = instanceCounts.r;
-float maxWeight = texture(maxTexture, vec2(0.5)).r;
-float step = weight / maxWeight;
-vec4 minMaxColor = mix(minColor, maxColor, step) / 255.;
-vec2 domain = colorDomain;
-float domainMaxValid = float(colorDomain.y != 0.);
-domain.y = mix(maxWeight, colorDomain.y, domainMaxValid);
-vec4 rangeColor = quantizeScale(domain, colorRange, weight);
-float rangeMinMax = float(shouldUseMinMax);
-vec4 color = mix(rangeColor, minMaxColor, rangeMinMax);
-vColor = vec4(color.rgb, color.a * opacity);
+if (isnan(instanceWeights)) {
+gl_Position = vec4(0.);
+return;
+}
+vec2 pos = instancePositions * screenGrid.gridSizeClipspace + positions * screenGrid.cellSizeClipspace;
+pos.x = pos.x - 1.0;
+pos.y = 1.0 - pos.y;
+gl_Position = vec4(pos, 0., 1.);
+vColor = interp(instanceWeights, screenGrid.colorDomain, colorRange);
+vColor.a *= layer.opacity;
 picking_setPickingColor(instancePickingColors);
-gl_Position = vec4(instancePositions + positions * cellScale, 1.);
 }
 `;