@deck.gl/extensions 9.1.0-beta.1 → 9.1.0

package/dist/index.cjs

@@ -236,7 +236,7 @@ var uniformBlock2 = (
 #endif
 #endif
 #ifdef DATACATEGORY_TYPE
-  highp ivec4 categoryBitMask;
+  highp uvec4 categoryBitMask;
 #endif
 } dataFilter;
 `
@@ -297,26 +297,26 @@ float dataFilter_reduceValue(vec4 value) {
 #ifdef DATACATEGORY_TYPE
   void dataFilter_setCategoryValue(DATACATEGORY_TYPE category) {
     #if DATACATEGORY_CHANNELS == 1 // One 128-bit mask
-    int dataFilter_masks = dataFilter.categoryBitMask[int(category / 32.0)];
+    uint dataFilter_masks = dataFilter.categoryBitMask[category / 32u];
     #elif DATACATEGORY_CHANNELS == 2 // Two 64-bit masks
-    ivec2 dataFilter_masks = ivec2(
-      dataFilter.categoryBitMask[int(category.x / 32.0)],
-      dataFilter.categoryBitMask[int(category.y / 32.0) + 2]
+    uvec2 dataFilter_masks = uvec2(
+      dataFilter.categoryBitMask[category.x / 32u],
+      dataFilter.categoryBitMask[category.y / 32u + 2u]
     );
     #elif DATACATEGORY_CHANNELS == 3 // Three 32-bit masks
-    ivec3 dataFilter_masks = dataFilter.categoryBitMask.xyz;
+    uvec3 dataFilter_masks = dataFilter.categoryBitMask.xyz;
     #else // Four 32-bit masks
-    ivec4 dataFilter_masks = dataFilter.categoryBitMask;
+    uvec4 dataFilter_masks = dataFilter.categoryBitMask;
     #endif
 
     // Shift mask and extract relevant bits
-    DATACATEGORY_TYPE dataFilter_bits = DATACATEGORY_TYPE(dataFilter_masks) / pow(DATACATEGORY_TYPE(2.0), mod(category, 32.0));
-    dataFilter_bits = mod(floor(dataFilter_bits), 2.0);
+    DATACATEGORY_TYPE dataFilter_bits = DATACATEGORY_TYPE(dataFilter_masks) >> (category & 31u);
+    dataFilter_bits &= 1u;
 
     #if DATACATEGORY_CHANNELS == 1
-    if(dataFilter_bits == 0.0) dataFilter_value = 0.0;
+    if(dataFilter_bits == 0u) dataFilter_value = 0.0;
     #else
-    if(any(equal(dataFilter_bits, DATACATEGORY_TYPE(0.0)))) dataFilter_value = 0.0;
+    if(any(equal(dataFilter_bits, DATACATEGORY_TYPE(0u)))) dataFilter_value = 0.0;
     #endif
   }
 #endif
@@ -340,7 +340,7 @@ function getUniforms(opts) {
   if (!opts || !("extensions" in opts)) {
     return {};
   }
-  const { filterRange = [-1, 1], filterEnabled = true, filterTransformSize = true, filterTransformColor = true, categoryBitMask = [0, 0, 0, 0] } = opts;
+  const { filterRange = [-1, 1], filterEnabled = true, filterTransformSize = true, filterTransformColor = true, categoryBitMask } = opts;
   const filterSoftRange = opts.filterSoftRange || filterRange;
   return {
     ...Number.isFinite(filterRange[0]) ? {
@@ -358,7 +358,7 @@ function getUniforms(opts) {
     useSoftMargin: Boolean(opts.filterSoftRange),
     transformSize: filterEnabled && filterTransformSize,
     transformColor: filterEnabled && filterTransformColor,
-    categoryBitMask
+    ...categoryBitMask && { categoryBitMask }
   };
 }
 function getUniforms64(opts) {
@@ -564,6 +564,7 @@ function getModel(device, bufferLayout, shaderOptions, useFloatTarget) {
     vertexCount: 1,
     isInstanced: false,
     topology: "point-list",
+    disableWarnings: true,
     vs: AGGREGATE_VS,
     fs: AGGREGATE_FS,
     bufferLayout,
@@ -599,6 +600,12 @@ var defaultOptions = {
   fp64: false,
   countItems: false
 };
+var CATEGORY_TYPE_FROM_SIZE = {
+  1: "uint",
+  2: "uvec2",
+  3: "uvec3",
+  4: "uvec4"
+};
 var DATA_TYPE_FROM_SIZE = {
   1: "float",
   2: "vec2",
@@ -613,7 +620,7 @@ var DataFilterExtension = class extends import_core3.LayerExtension {
     const { categorySize, filterSize, fp64: fp642 } = extension.opts;
     const defines = {};
     if (categorySize) {
-      defines.DATACATEGORY_TYPE = DATA_TYPE_FROM_SIZE[categorySize];
+      defines.DATACATEGORY_TYPE = CATEGORY_TYPE_FROM_SIZE[categorySize];
       defines.DATACATEGORY_CHANNELS = categorySize;
     }
     if (filterSize) {
@@ -644,6 +651,7 @@ var DataFilterExtension = class extends import_core3.LayerExtension {
             size: categorySize,
             stepMode: "dynamic",
             accessor: "getFilterCategory",
+            type: "uint32",
             transform: categorySize === 1 ? (d) => extension._getCategoryKey.call(this, d, 0) : (d) => d.map((x, i) => extension._getCategoryKey.call(this, x, i))
           }
         });
@@ -1614,7 +1622,12 @@ var CollisionFilterPass = class extends import_core12._LayersPass {
     this.render({ ...options, clearColor, scissorRect, target, pass: "collision" });
   }
   getLayerParameters(layer, layerIndex, viewport) {
-    return { ...layer.props.parameters, blend: false, depthRange: [0, 1], depthTest: true };
+    return {
+      ...layer.props.parameters,
+      blend: false,
+      depthWriteEnabled: true,
+      depthCompare: "less-equal"
+    };
   }
   getShaderModuleProps() {
     return {
@@ -2030,7 +2043,7 @@ var MaskPass = class extends import_core17._LayersPass {
     return {
       ...layer.props.parameters,
       blend: true,
-      depthTest: false,
+      depthCompare: "always",
       ...MASK_BLENDING
     };
   }
@@ -2797,7 +2810,7 @@ var TerrainPass = class extends import_core23._LayersPass {
     return {
       ...layer.props.parameters,
       blend: true,
-      depthTest: false,
+      depthCompare: "always",
       ...layer.props.operation.includes("terrain") && TERRAIN_BLENDING
     };
   }
@@ -2866,7 +2879,7 @@ var TerrainPickingPass = class extends import_core24._PickLayersPass {
       parameters2 = super.getLayerParameters(layer, layerIndex, viewport);
       parameters2.blend = true;
     }
-    return { ...parameters2, depthTest: false };
+    return { ...parameters2, depthCompare: "always" };
   }
   getShaderModuleProps(layer, effects, otherShaderModuleProps) {
     return {