@deck.gl/aggregation-layers 9.0.0-beta.5 → 9.0.0-beta.7

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

@@ -1,4 +1,4 @@
-import { Device, Texture } from '@luma.gl/core';
+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";
@@ -12,7 +12,6 @@ export type _ScreenGridCellLayerProps<DataT> = _ScreenGridLayerProps<DataT> & {
 export default class ScreenGridCellLayer<DataT = any, ExtraPropsT extends {} = {}> extends Layer<ExtraPropsT & Required<_ScreenGridCellLayerProps<DataT>>> {
     static layerName: string;
     static defaultProps: DefaultProps<ScreenGridCellLayerProps<unknown>>;
-    static isSupported(device: Device): boolean;
     state: {
         model?: Model;
     };

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,MAAM,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC9C,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,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM;IAIjC,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;IA2Bf,0BAA0B,CAAC,SAAS,KAAA,EAAE,EAAC,YAAY,EAAC;;KAAA;IAkBpD,SAAS,IAAI,KAAK;IAsBlB,gBAAgB,IAAI,OAAO;IAe3B,eAAe,CAAC,QAAQ,KAAA,EAAE,KAAK,KAAA,EAAE,WAAW,KAAA,GAAG,IAAI;CA2BpD"}
+{"version":3,"file":"screen-grid-cell-layer.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/screen-grid-cell-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAS,OAAO,EAAC,MAAM,eAAe,CAAC;AAC9C,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;IA2Bf,0BAA0B,CAAC,SAAS,KAAA,EAAE,EAAC,YAAY,EAAC;;KAAA;IAkBpD,SAAS,IAAI,KAAK;IAsBlB,gBAAgB,IAAI,OAAO;IAe3B,eAAe,CAAC,QAAQ,KAAA,EAAE,KAAK,KAAA,EAAE,WAAW,KAAA,GAAG,IAAI;CA2BpD"}

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

@@ -34,9 +34,6 @@ const defaultProps = {
 export default class ScreenGridCellLayer extends Layer {
     static { this.layerName = 'ScreenGridCellLayer'; }
     static { this.defaultProps = defaultProps; }
-    static isSupported(device) {
-        return device.features.has('texture-formats-float32-webgl1');
-    }
     getShaders() {
         return { vs, fs, modules: [picking] };
     }

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

@@ -21,20 +21,15 @@
 export default `\
 #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);
+if (vSampleCount <= 0.0) {
+discard;
+}
+fragColor = vColor;
+DECKGL_FILTER_COLOR(fragColor, geometry);
 }
 `;

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

@@ -21,12 +21,10 @@ export default `\
 #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 vec3 instancePickingColors;
-
 uniform float opacity;
 uniform vec3 cellScale;
 uniform vec4 minColor;
@@ -35,50 +33,40 @@ uniform vec4 colorRange[RANGE_COUNT];
 uniform vec2 colorDomain;
 uniform bool shouldUseMinMax;
 uniform sampler2D maxTexture;
-
 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 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;
 }
-
 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);
-
-  // Set color to be rendered to picking fbo (also used to check for selection highlight).
-  picking_setPickingColor(instancePickingColors);
-
-  gl_Position = vec4(instancePositions + positions * cellScale, 1.);
+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);
+picking_setPickingColor(instancePickingColors);
+gl_Position = vec4(instancePositions + positions * cellScale, 1.);
 }
 `;

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

@@ -53,9 +53,6 @@ export type _ScreenGridLayerProps<DataT> = {
     /**
      * Perform aggregation is performed on GPU.
      *
-     * NOTE: GPU Aggregation requires WebGL2 support by the browser.
-     * When `gpuAggregation` is set to true and browser doesn't support WebGL2, aggregation falls back to CPU.
-     *
      * @default true
      */
     gpuAggregation?: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"screen-grid-layer.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/screen-grid-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,QAAQ,EACR,KAAK,EACL,oBAAoB,EACpB,KAAK,EACL,YAAY,EACZ,UAAU,EAEV,WAAW,EACX,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAKnD,OAAO,oBAAoB,EAAE,EAAC,yBAAyB,EAAC,qCAAkC;AAuB1F,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,OAAO,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAC9E,yBAAyB,CAAC,KAAK,CAAC,CAAC;AAEnC,2CAA2C;AAC3C,MAAM,MAAM,qBAAqB,CAAC,KAAK,IAAI;IACzC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAExB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAExB;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAEtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC;IAErB;;;;OAIG;IACH,WAAW,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAExC;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEpC;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;CAC9C,CAAC;AAEF,sEAAsE;AACtE,MAAM,CAAC,OAAO,OAAO,eAAe,CAClC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,oBAAoB,CAAC,KAAK,EAAE,UAAU,GAAG,QAAQ,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;IACxF,MAAM,CAAC,SAAS,SAAqB;IACrC,MAAM,CAAC,YAAY,8CAAgB;IAEnC,KAAK,EAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG;QAC7C,SAAS,EAAE,OAAO,CAAC;QACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC;QACxB,cAAc,CAAC,EAAE,GAAG,CAAC;QACrB,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,eAAe;IA2Cf,iBAAiB,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAIvD,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAIxC,YAAY,IAAI,UAAU,GAAG,KAAK;IAuBlC,aAAa,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAU1C,cAAc,CAAC,EAAC,IAAI,EAAC,EAAE,oBAAoB,GAAG,WAAW;IAsBzD,aAAa,CAAC,EAAC,eAAe,EAAE,OAAO,EAAC;;;KAAA;IASxC,sBAAsB,CAAC,IAAI,KAAA;IAiE3B,gBAAgB,CAAC,IAAI,KAAA;IAUrB,aAAa;CAMd"}
+{"version":3,"file":"screen-grid-layer.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/screen-grid-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,QAAQ,EACR,KAAK,EACL,oBAAoB,EACpB,KAAK,EACL,YAAY,EACZ,UAAU,EAEV,WAAW,EACX,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAInD,OAAO,oBAAoB,EAAE,EAAC,yBAAyB,EAAC,qCAAkC;AAuB1F,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,OAAO,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAC9E,yBAAyB,CAAC,KAAK,CAAC,CAAC;AAEnC,2CAA2C;AAC3C,MAAM,MAAM,qBAAqB,CAAC,KAAK,IAAI;IACzC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAExB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAExB;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAEtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC;IAErB;;;;OAIG;IACH,WAAW,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAExC;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEpC;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;CAC9C,CAAC;AAEF,sEAAsE;AACtE,MAAM,CAAC,OAAO,OAAO,eAAe,CAClC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,oBAAoB,CAAC,KAAK,EAAE,UAAU,GAAG,QAAQ,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;IACxF,MAAM,CAAC,SAAS,SAAqB;IACrC,MAAM,CAAC,YAAY,8CAAgB;IAEnC,KAAK,EAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG;QAC7C,SAAS,EAAE,OAAO,CAAC;QACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC;QACxB,cAAc,CAAC,EAAE,GAAG,CAAC;QACrB,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,eAAe;IAqCf,iBAAiB,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAIvD,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAIxC,YAAY,IAAI,UAAU,GAAG,KAAK;IAuBlC,aAAa,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAU1C,cAAc,CAAC,EAAC,IAAI,EAAC,EAAE,oBAAoB,GAAG,WAAW;IAsBzD,aAAa,CAAC,EAAC,eAAe,EAAE,OAAO,EAAC;;;KAAA;IASxC,sBAAsB,CAAC,IAAI,KAAA;IAiE3B,gBAAgB,CAAC,IAAI,KAAA;IAUrB,aAAa;CAMd"}

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

@@ -18,7 +18,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 import { log } from '@deck.gl/core';
-import { GL } from '@luma.gl/constants';
 import GPUGridAggregator from "../utils/gpu-grid-aggregation/gpu-grid-aggregator.js";
 import { AGGREGATION_OPERATION, getValueFunc } from "../utils/aggregation-operation-utils.js";
 import ScreenGridCellLayer from "./screen-grid-cell-layer.js";
@@ -46,12 +45,6 @@ export default class ScreenGridLayer extends GridAggregationLayer {
     static { this.layerName = 'ScreenGridLayer'; }
     static { this.defaultProps = defaultProps; }
     initializeState() {
-        if (!ScreenGridCellLayer.isSupported(this.context.device)) {
-            // max aggregated value is sampled from a float texture
-            this.setState({ supported: false });
-            log.error(`ScreenGridLayer: ${this.id} is not supported on this browser`)();
-            return;
-        }
         super.initializeAggregationLayer({
             dimensions: DIMENSIONS,
             // @ts-expect-error
@@ -80,7 +73,7 @@ export default class ScreenGridLayer extends GridAggregationLayer {
             [POSITION_ATTRIBUTE_NAME]: {
                 size: 3,
                 accessor: 'getPosition',
-                type: GL.DOUBLE,
+                type: 'float64',
                 fp64: this.use64bitPositions()
             },
             // this attribute is used in gpu aggregation path only

package/dist/utils/gpu-grid-aggregation/aggregate-all-fs.glsl.js

@@ -20,20 +20,17 @@
 export default `\
 #version 300 es
 #define SHADER_NAME gpu-aggregation-all-fs
-
 precision highp float;
-
 in vec2 vTextureCoord;
 uniform sampler2D uSampler;
 uniform bool combineMaxMin;
 out vec4 fragColor;
 void main(void) {
-  vec4 textureColor = texture(uSampler, vec2(vTextureCoord.s, vTextureCoord.t));
-  if (textureColor.a == 0.) {
-    discard;
-  }
-  fragColor.rgb = textureColor.rgb;
-  // if combineMinMax is true, use Alpha channel for first weights min value.
-  fragColor.a = combineMaxMin ? textureColor.r : textureColor.a;
+vec4 textureColor = texture(uSampler, vec2(vTextureCoord.s, vTextureCoord.t));
+if (textureColor.a == 0.) {
+discard;
+}
+fragColor.rgb = textureColor.rgb;
+fragColor.a = combineMaxMin ? textureColor.r : textureColor.a;
 }
 `;

package/dist/utils/gpu-grid-aggregation/aggregate-all-vs.glsl.js

@@ -20,34 +20,23 @@
 export default `\
 #version 300 es
 #define SHADER_NAME gpu-aggregation-all-vs-64
-
 in vec2 position;
 uniform ivec2 gridSize;
 out vec2 vTextureCoord;
-
 void main(void) {
-  // Map each position to single pixel
-  vec2 pos = vec2(-1.0, -1.0);
-
-  // Move to pixel center, pixel-size in screen sapce (2/gridSize) * 0.5 => 1/gridSize
-  vec2 offset = 1.0 / vec2(gridSize);
-  pos = pos + offset;
-
-  gl_Position = vec4(pos, 0.0, 1.0);
-
-  int yIndex = gl_InstanceID / gridSize[0];
-  int xIndex = gl_InstanceID - (yIndex * gridSize[0]);
-
-  vec2 yIndexFP64 = vec2(float(yIndex), 0.);
-  vec2 xIndexFP64 = vec2(float(xIndex), 0.);
-  vec2 gridSizeYFP64 = vec2(gridSize[1], 0.);
-  vec2 gridSizeXFP64 = vec2(gridSize[0], 0.);
-
-  vec2 texCoordXFP64 = div_fp64(yIndexFP64, gridSizeYFP64);
-  vec2 texCoordYFP64 = div_fp64(xIndexFP64, gridSizeXFP64);
-
-  vTextureCoord = vec2(texCoordYFP64.x, texCoordXFP64.x);
-  // Enforce default value for ANGLE issue (https://bugs.chromium.org/p/angleproject/issues/detail?id=3941)
-  gl_PointSize = 1.0;
+vec2 pos = vec2(-1.0, -1.0);
+vec2 offset = 1.0 / vec2(gridSize);
+pos = pos + offset;
+gl_Position = vec4(pos, 0.0, 1.0);
+int yIndex = gl_InstanceID / gridSize[0];
+int xIndex = gl_InstanceID - (yIndex * gridSize[0]);
+vec2 yIndexFP64 = vec2(float(yIndex), 0.);
+vec2 xIndexFP64 = vec2(float(xIndex), 0.);
+vec2 gridSizeYFP64 = vec2(gridSize[1], 0.);
+vec2 gridSizeXFP64 = vec2(gridSize[0], 0.);
+vec2 texCoordXFP64 = div_fp64(yIndexFP64, gridSizeYFP64);
+vec2 texCoordYFP64 = div_fp64(xIndexFP64, gridSizeXFP64);
+vTextureCoord = vec2(texCoordYFP64.x, texCoordXFP64.x);
+gl_PointSize = 1.0;
 }
 `;

package/dist/utils/gpu-grid-aggregation/aggregate-to-grid-fs.glsl.js

@@ -20,15 +20,11 @@
 export default `\
 #version 300 es
 #define SHADER_NAME gpu-aggregation-to-grid-fs
-
 precision highp float;
-
 in vec3 vWeights;
-
 out vec4 fragColor;
-
 void main(void) {
-  fragColor = vec4(vWeights, 1.0);
-  DECKGL_FILTER_COLOR(fragColor, geometry);
+fragColor = vec4(vWeights, 1.0);
+DECKGL_FILTER_COLOR(fragColor, geometry);
 }
 `;

package/dist/utils/gpu-grid-aggregation/aggregate-to-grid-vs.glsl.js

@@ -20,7 +20,6 @@
 export default `\
 #version 300 es
 #define SHADER_NAME gpu-aggregation-to-grid-vs
-
 in vec3 positions;
 in vec3 positions64Low;
 in vec3 weights;
@@ -29,50 +28,34 @@ uniform vec2 gridSize;
 uniform bool projectPoints;
 uniform vec2 translation;
 uniform vec3 scaling;
-
 out vec3 vWeights;
-
 vec2 project_to_pixel(vec4 pos) {
-  vec4 result;
-  pos.xy = pos.xy/pos.w;
-  result = pos + vec4(translation, 0., 0.);
-  result.xy = scaling.z > 0. ? result.xy * scaling.xy : result.xy;
-  return result.xy;
+vec4 result;
+pos.xy = pos.xy/pos.w;
+result = pos + vec4(translation, 0., 0.);
+result.xy = scaling.z > 0. ? result.xy * scaling.xy : result.xy;
+return result.xy;
 }
-
 void main(void) {
-
-  vWeights = weights;
-
-  vec4 windowPos = vec4(positions, 1.);
-  if (projectPoints) {
-    windowPos = project_position_to_clipspace(positions, positions64Low, vec3(0));
-  }
-
-  vec2 pos = project_to_pixel(windowPos);
-
-  vec2 pixelXY64[2];
-  pixelXY64[0] = vec2(pos.x, 0.);
-  pixelXY64[1] = vec2(pos.y, 0.);
-
-  // Transform (0,0):windowSize -> (0, 0): gridSize
-  vec2 gridXY64[2];
-  gridXY64[0] = div_fp64(pixelXY64[0], vec2(cellSize.x, 0));
-  gridXY64[1] = div_fp64(pixelXY64[1], vec2(cellSize.y, 0));
-  float x = floor(gridXY64[0].x);
-  float y = floor(gridXY64[1].x);
-  pos = vec2(x, y);
-
-  // Transform (0,0):gridSize -> (-1, -1):(1,1)
-  pos = (pos * (2., 2.) / (gridSize)) - (1., 1.);
-
-  // Move to pixel center, pixel-size in screen sapce (2/gridSize) * 0.5 => 1/gridSize
-  vec2 offset = 1.0 / gridSize;
-  pos = pos + offset;
-
-  gl_Position = vec4(pos, 0.0, 1.0);
-
-  // Enforce default value for ANGLE issue (https://bugs.chromium.org/p/angleproject/issues/detail?id=3941)
-  gl_PointSize = 1.0;
+vWeights = weights;
+vec4 windowPos = vec4(positions, 1.);
+if (projectPoints) {
+windowPos = project_position_to_clipspace(positions, positions64Low, vec3(0));
+}
+vec2 pos = project_to_pixel(windowPos);
+vec2 pixelXY64[2];
+pixelXY64[0] = vec2(pos.x, 0.);
+pixelXY64[1] = vec2(pos.y, 0.);
+vec2 gridXY64[2];
+gridXY64[0] = div_fp64(pixelXY64[0], vec2(cellSize.x, 0));
+gridXY64[1] = div_fp64(pixelXY64[1], vec2(cellSize.y, 0));
+float x = floor(gridXY64[0].x);
+float y = floor(gridXY64[1].x);
+pos = vec2(x, y);
+pos = (pos * (2., 2.) / (gridSize)) - (1., 1.);
+vec2 offset = 1.0 / gridSize;
+pos = pos + offset;
+gl_Position = vec4(pos, 0.0, 1.0);
+gl_PointSize = 1.0;
 }
 `;

package/dist/utils/gpu-grid-aggregation/gpu-grid-aggregator-constants.js

@@ -7,12 +7,12 @@ export const DEFAULT_RUN_PARAMS = {
     moduleSettings: {}
 };
 export const MAX_32_BIT_FLOAT = 3.402823466e38;
-export const MIN_BLEND_EQUATION = [GL.MIN, GL.FUNC_ADD];
-export const MAX_BLEND_EQUATION = [GL.MAX, GL.FUNC_ADD];
-export const MAX_MIN_BLEND_EQUATION = [GL.MAX, GL.MIN];
+export const MIN_BLEND_EQUATION = [32775, 32774];
+export const MAX_BLEND_EQUATION = [32776, 32774];
+export const MAX_MIN_BLEND_EQUATION = [32776, 32775];
 export const EQUATION_MAP = {
-    [AGGREGATION_OPERATION.SUM]: GL.FUNC_ADD,
-    [AGGREGATION_OPERATION.MEAN]: GL.FUNC_ADD,
+    [AGGREGATION_OPERATION.SUM]: 32774,
+    [AGGREGATION_OPERATION.MEAN]: 32774,
     [AGGREGATION_OPERATION.MIN]: MIN_BLEND_EQUATION,
     [AGGREGATION_OPERATION.MAX]: MAX_BLEND_EQUATION
 };
@@ -27,15 +27,15 @@ export const DEFAULT_WEIGHT_PARAMS = {
 export const PIXEL_SIZE = 4; // RGBA32F
 export const WEIGHT_SIZE = 3;
 export const MAX_MIN_TEXTURE_OPTS = {
-    format: GL.RGBA32F,
-    type: GL.FLOAT,
+    format: 34836,
+    type: 5126,
     border: 0,
     mipmaps: false,
     sampler: {
         minFilter: 'nearest',
         magFilter: 'nearest'
     },
-    dataFormat: GL.RGBA,
+    dataFormat: 6408,
     width: 1,
     height: 1
 };

package/dist/utils/gpu-grid-aggregation/gpu-grid-aggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gpu-grid-aggregator.d.ts","sourceRoot":"","sources":["../../../src/utils/gpu-grid-aggregation/gpu-grid-aggregator.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,MAAM,EAAgB,MAAM,eAAe,CAAC;AAwCzD,MAAM,MAAM,sBAAsB,GAAG;IACnC,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAEpC,MAAM,CAAC,kBAAkB,CAAC,EACxB,eAAe,EACf,OAAO,EACP,OAAO,EACP,UAAU,EACV,UAAU,EACX,EAAE;QACD,eAAe,CAAC,EAAE,YAAY,CAAC;QAC/B,OAAO,CAAC,EAAE,YAAY,CAAC;QACvB,OAAO,CAAC,EAAE,YAAY,CAAC;QACvB,UAAU,CAAC,EAAE,YAAY,CAAC;QAC1B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;IAwBD,MAAM,CAAC,WAAW,CAAC,EAAC,UAAU,EAAE,IAAQ,EAAC;;;KAAA;;;;IAezC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM;IA6BjC,KAAK;;;;;;;;;;;;;;MAoBH;IAEF,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IAExB,oBAAoB,MAAC;IACrB,mBAAmB,MAAC;IACpB,aAAa,MAAC;gBAEF,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,sBAA2B;IAoB9D,MAAM;IA4BN,GAAG,CAAC,IAAI,KAAK;IAab,OAAO,CAAC,QAAQ,KAAA;;;;;;IA4BhB,aAAa,CAAC,aAAa,KAAK;IAMhC,2BAA2B,CAAC,IAAI,KAAA;IAUhC,QAAQ,CAAC,YAAY,KAAA;IAMrB,iBAAiB,CAAC,IAAI,KAAA;IA+CtB,oBAAoB,CAAC,IAAI,KAAA;IA2EzB,sBAAsB,CAAC,IAAI,KAAA;IAyB3B,uBAAuB,CAAC,IAAI,KAAA;IAqD5B,eAAe,CAAC,IAAI,KAAA;IAWpB,kBAAkB,CAAC,IAAI,KAAA;IAyEvB,iBAAiB,CAAC,IAAI,KAAA;IAQtB,YAAY,CAAC,EAAC,MAAU,EAAE,MAAU,EAAC;;;KAAK;IAW1C,sBAAsB,CAAC,IAAI,KAAA;IAQ3B,wHAAwH;IAExH,sBAAsB,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAoBvC,aAAa,CAAC,IAAI,KAAA;CAiBnB"}
+{"version":3,"file":"gpu-grid-aggregator.d.ts","sourceRoot":"","sources":["../../../src/utils/gpu-grid-aggregation/gpu-grid-aggregator.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,MAAM,EAAgB,MAAM,eAAe,CAAC;AAqCzD,MAAM,MAAM,sBAAsB,GAAG;IACnC,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAEpC,MAAM,CAAC,kBAAkB,CAAC,EACxB,eAAe,EACf,OAAO,EACP,OAAO,EACP,UAAU,EACV,UAAU,EACX,EAAE;QACD,eAAe,CAAC,EAAE,YAAY,CAAC;QAC/B,OAAO,CAAC,EAAE,YAAY,CAAC;QACvB,OAAO,CAAC,EAAE,YAAY,CAAC;QACvB,UAAU,CAAC,EAAE,YAAY,CAAC;QAC1B,UAAU,EAAE,MAAM,CAAC;KACpB;;;;;;;IAwBD,MAAM,CAAC,WAAW,CAAC,EAAC,UAAU,EAAE,IAAQ,EAAC;;;KAAA;;;;IAezC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM;IA6BjC,KAAK;;;;;;;;;;;;;;MAoBH;IAEF,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IAExB,oBAAoB,MAAC;IACrB,mBAAmB,MAAC;IACpB,aAAa,MAAC;gBAEF,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,sBAA2B;IAe9D,MAAM;IA4BN,GAAG,CAAC,IAAI,KAAK;IAUb,OAAO,CAAC,QAAQ,KAAA;;;;;;IA4BhB,aAAa,CAAC,aAAa,KAAK;IAMhC,2BAA2B,CAAC,IAAI,KAAA;IAUhC,QAAQ,CAAC,YAAY,KAAA;IAMrB,iBAAiB,CAAC,IAAI,KAAA;IA+CtB,oBAAoB,CAAC,IAAI,KAAA;IA2EzB,sBAAsB,CAAC,IAAI,KAAA;IAyB3B,uBAAuB,CAAC,IAAI,KAAA;IAqD5B,eAAe,CAAC,IAAI,KAAA;IAWpB,kBAAkB,CAAC,IAAI,KAAA;IAyEvB,iBAAiB,CAAC,IAAI,KAAA;IAQtB,YAAY,CAAC,EAAC,MAAU,EAAE,MAAU,EAAC;;;KAAK;IAW1C,sBAAsB,CAAC,IAAI,KAAA;IAQ3B,wHAAwH;IAExH,sBAAsB,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAoBvC,aAAa,CAAC,IAAI,KAAA;CAiBnB"}

package/dist/utils/gpu-grid-aggregation/gpu-grid-aggregator.js

@@ -20,7 +20,7 @@
 import { Model, TextureTransform } from '@luma.gl/engine';
 import { fp64arithmetic } from '@luma.gl/shadertools';
 import { GL } from '@luma.gl/constants';
-import { log, project32, _mergeShaders as mergeShaders, getShaderAssembler } from '@deck.gl/core';
+import { project32, _mergeShaders as mergeShaders, getShaderAssembler } from '@deck.gl/core';
 import { DEFAULT_RUN_PARAMS, MAX_32_BIT_FLOAT, MIN_BLEND_EQUATION, MAX_BLEND_EQUATION, MAX_MIN_BLEND_EQUATION, EQUATION_MAP, DEFAULT_WEIGHT_PARAMS, PIXEL_SIZE } from "./gpu-grid-aggregator-constants.js";
 import { AGGREGATION_OPERATION } from "../aggregation-operation-utils.js";
 import AGGREGATE_TO_GRID_VS from "./aggregate-to-grid-vs.glsl.js";
@@ -36,11 +36,8 @@ const ARRAY_BUFFER_MAP = {
     maxMinData: 'maxMinBuffer'
 };
 const REQUIRED_FEATURES = [
-    'webgl2',
-    'blend-minmax-webgl1',
-    'texture-renderable-float32-webgl',
-    'texture-blend-float-webgl1',
-    'texture-formats-float32-webgl1'
+    'float32-renderable-webgl',
+    'texture-blend-float-webgl'
 ];
 export default class GPUGridAggregator {
     // Decode and return aggregation data of given pixel.
@@ -131,14 +128,9 @@ export default class GPUGridAggregator {
         this.id = props.id || 'gpu-grid-aggregator';
         this.device = device;
         const REQUIRED_FEATURES = [
-            'blend-minmax-webgl1', // set min/max blend modes
-            'texture-renderable-float32-webgl', // render to float texture
-            'texture-formats-float32-webgl1' // sample from a float texture
+            'float32-renderable-webgl' // render to float texture
         ];
-        // gl_InstanceID usage in min/max calculation shaders
-        this._hasGPUSupport =
-            this.device.info.type === 'webgl2' &&
-                REQUIRED_FEATURES.every(feature => device.features.has(feature));
+        this._hasGPUSupport = REQUIRED_FEATURES.every(feature => device.features.has(feature));
         if (this._hasGPUSupport) {
             this._setupModels();
         }
@@ -165,9 +157,6 @@ export default class GPUGridAggregator {
         // reset results
         this.setState({ results: {} });
         const aggregationParams = this._normalizeAggregationParams(opts);
-        if (!this._hasGPUSupport) {
-            log.log(1, 'GPUGridAggregator: not supported')();
-        }
         return this._runAggregation(aggregationParams);
     }
     // Reads aggregation data into JS Array object
@@ -220,12 +209,12 @@ export default class GPUGridAggregator {
             results[id].aggregationTexture = textures[id];
             results[id].aggregationBuffer = this.device.readPixelsToBufferWebGL(framebuffers[id], {
                 target: weights[id].aggregationBuffer, // update if a buffer is provided
-                sourceType: GL.FLOAT
+                sourceType: 5126
             });
             if (needMin && needMax && combineMaxMin) {
                 results[id].maxMinBuffer = this.device.readPixelsToBufferWebGL(maxMinFramebuffers[id], {
                     target: weights[id].maxMinBuffer, // update if a buffer is provided
-                    sourceType: GL.FLOAT
+                    sourceType: 5126
                 });
                 results[id].maxMinTexture = resources[`${id}-maxMinTexture`];
             }
@@ -233,14 +222,14 @@ export default class GPUGridAggregator {
                 if (needMin) {
                     results[id].minBuffer = this.device.readPixelsToBufferWebGL(minFramebuffers[id], {
                         target: weights[id].minBuffer, // update if a buffer is provided
-                        sourceType: GL.FLOAT
+                        sourceType: 5126
                     });
                     results[id].minTexture = resources[`${id}-minTexture`];
                 }
                 if (needMax) {
                     results[id].maxBuffer = this.device.readPixelsToBufferWebGL(maxFramebuffers[id], {
                         target: weights[id].maxBuffer, // update if a buffer is provided
-                        sourceType: GL.FLOAT
+                        sourceType: 5126
                     });
                     results[id].maxTexture = resources[`${id}-maxTexture`];
                 }
@@ -256,7 +245,7 @@ export default class GPUGridAggregator {
         const parameters = {
             blend: true,
             depthTest: false,
-            blendFunc: [GL.ONE, GL.ONE]
+            blendFunc: [1, 1]
         };
         const uniforms = {
             cellSize,
@@ -373,7 +362,7 @@ export default class GPUGridAggregator {
                 }
             });
             // update framebuffer with mean results so device.readPixelsToBufferWebGL returns mean values
-            framebuffers[id].attach({ [GL.COLOR_ATTACHMENT0]: textures[id] });
+            framebuffers[id].attach({ [36064]: textures[id] });
         }
     }
     _runAggregation(opts) {
@@ -408,7 +397,7 @@ export default class GPUGridAggregator {
                 texture = meanTextures[id];
             }
             if (framebuffers[id]) {
-                framebuffers[id].attach({ [GL.COLOR_ATTACHMENT0]: texture });
+                framebuffers[id].attach({ [36064]: texture });
             }
             else {
                 framebuffers[id] = getFramebuffer(this.device, {
@@ -536,7 +525,7 @@ function getAggregationModel(device, shaderOptions) {
     return new Model(device, {
         id: 'Grid-Aggregation-Model',
         vertexCount: 1,
-        drawMode: GL.POINTS,
+        drawMode: 0,
         shaderAssembler: getShaderAssembler(),
         ...shaders
     });

package/dist/utils/gpu-grid-aggregation/transform-mean-vs.glsl.js

@@ -22,16 +22,11 @@ export default `\
 #define SHADER_NAME gpu-aggregation-transform-mean-vs
 in vec4 aggregationValues;
 out vec4 meanValues;
-
 void main()
 {
-  // TODO: Use 64-bit division ?? not needed given this is aggregation ??
-  bool isCellValid = bool(aggregationValues.w > 0.);
-  // aggregationValues:  XYZ contain aggregated values, W contains count
-  meanValues.xyz = isCellValid ? aggregationValues.xyz/aggregationValues.w : vec3(0, 0, 0);
-  meanValues.w = aggregationValues.w;
-
-  // Enforce default value for ANGLE issue (https://bugs.chromium.org/p/angleproject/issues/detail?id=3941)
-  gl_PointSize = 1.0;
+bool isCellValid = bool(aggregationValues.w > 0.);
+meanValues.xyz = isCellValid ? aggregationValues.xyz/aggregationValues.w : vec3(0, 0, 0);
+meanValues.w = aggregationValues.w;
+gl_PointSize = 1.0;
 }
 `;