@deck.gl/extensions 9.0.12 → 9.0.14

package/src/data-filter/data-filter-extension.ts

@@ -167,15 +167,8 @@ export default class DataFilterExtension extends LayerExtension<
           filterValues: {
             size: filterSize,
             type: fp64 ? 'float64' : 'float32',
-            accessor: 'getFilterValue',
-            shaderAttributes: {
-              filterValues: {
-                divisor: 0
-              },
-              instanceFilterValues: {
-                divisor: 1
-              }
-            }
+            stepMode: 'dynamic',
+            accessor: 'getFilterValue'
           }
         });
       }
@@ -184,19 +177,12 @@ export default class DataFilterExtension extends LayerExtension<
         attributeManager.add({
           filterCategoryValues: {
             size: categorySize,
+            stepMode: 'dynamic',
             accessor: 'getFilterCategory',
             transform:
               categorySize === 1
                 ? d => extension._getCategoryKey.call(this, d, 0)
-                : d => d.map((x, i) => extension._getCategoryKey.call(this, x, i)),
-            shaderAttributes: {
-              filterCategoryValues: {
-                divisor: 0
-              },
-              instanceFilterCategoryValues: {
-                divisor: 1
-              }
-            }
+                : d => d.map((x, i) => extension._getCategoryKey.call(this, x, i))
           }
         });
       }

package/src/data-filter/shader-module.ts

@@ -25,20 +25,6 @@ export type Defines = {
    * Enable 64-bit precision in numeric filter.
    */
   DATAFILTER_DOUBLE?: boolean;
-
-  // Defines derived in shader
-  /**
-   * Numeric filter attribute
-   */
-  DATAFILTER_ATTRIB?: 'filterValues' | 'instanceFilterValues';
-  /**
-   * Numeric filter attribute (low bits). Only used when `DATAFILTER_DOUBLE = true`
-   */
-  DATAFILTER_ATTRIB_64LOW?: 'filterValues64Low' | 'instanceFilterValues64Low';
-  /**
-   * Category filter attribute
-   */
-  DATACATEGORY_ATTRIB?: 'filterCategoryValues' | 'instanceFilterCategoryValues';
 };
 
 const vs = glsl`
@@ -53,17 +39,9 @@ uniform ivec4 filter_categoryBitMask;
   uniform DATAFILTER_TYPE filter_softMax;
   uniform DATAFILTER_TYPE filter_max;
 
-  #ifdef NON_INSTANCED_MODEL
-    #define DATAFILTER_ATTRIB filterValues
-    #define DATAFILTER_ATTRIB_64LOW filterValues64Low
-  #else
-    #define DATAFILTER_ATTRIB instanceFilterValues
-    #define DATAFILTER_ATTRIB_64LOW instanceFilterValues64Low
-  #endif
-
-  in DATAFILTER_TYPE DATAFILTER_ATTRIB;
+  in DATAFILTER_TYPE filterValues;
   #ifdef DATAFILTER_DOUBLE
-    in DATAFILTER_TYPE DATAFILTER_ATTRIB_64LOW;
+    in DATAFILTER_TYPE filterValues64Low;
 
     uniform DATAFILTER_TYPE filter_min64High;
     uniform DATAFILTER_TYPE filter_max64High;
@@ -72,12 +50,7 @@ uniform ivec4 filter_categoryBitMask;
 
 
 #ifdef DATACATEGORY_TYPE
-  #ifdef NON_INSTANCED_MODEL
-    #define DATACATEGORY_ATTRIB filterCategoryValues
-  #else
-    #define DATACATEGORY_ATTRIB instanceFilterCategoryValues
-  #endif
-  in DATACATEGORY_TYPE DATACATEGORY_ATTRIB;
+  in DATACATEGORY_TYPE filterCategoryValues;
 #endif
 
 out float dataFilter_value;
@@ -119,7 +92,7 @@ float dataFilter_reduceValue(vec4 value) {
   }
 #endif
 
-#ifdef DATACATEGORY_ATTRIB
+#ifdef DATACATEGORY_TYPE
   void dataFilter_setCategoryValue(DATACATEGORY_TYPE category) {
     #if DATACATEGORY_CHANNELS == 1 // One 128-bit mask
     int dataFilter_masks = filter_categoryBitMask[int(category / 32.0)];
@@ -223,19 +196,19 @@ const inject = {
   'vs:#main-start': glsl`
     dataFilter_value = 1.0;
     if (filter_enabled) {
-      #ifdef DATAFILTER_ATTRIB
+      #ifdef DATAFILTER_TYPE
         #ifdef DATAFILTER_DOUBLE
           dataFilter_setValue(
-            DATAFILTER_ATTRIB - filter_min64High + DATAFILTER_ATTRIB_64LOW,
-            DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW
+            filterValues - filter_min64High + filterValues64Low,
+            filterValues - filter_max64High + filterValues64Low
           );
         #else
-          dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB);
+          dataFilter_setValue(filterValues, filterValues);
         #endif
       #endif
 
-      #ifdef DATACATEGORY_ATTRIB
-        dataFilter_setCategoryValue(DATACATEGORY_ATTRIB);
+      #ifdef DATACATEGORY_TYPE
+        dataFilter_setCategoryValue(filterCategoryValues);
       #endif
     }
   `,

package/src/fill-style/fill-style-extension.ts

@@ -110,41 +110,20 @@ export default class FillStyleExtension extends LayerExtension<FillStyleExtensio
       attributeManager!.add({
         fillPatternFrames: {
           size: 4,
+          stepMode: 'dynamic',
           accessor: 'getFillPattern',
-          transform: extension.getPatternFrame.bind(this),
-          shaderAttributes: {
-            fillPatternFrames: {
-              divisor: 0
-            },
-            instanceFillPatternFrames: {
-              divisor: 1
-            }
-          }
+          transform: extension.getPatternFrame.bind(this)
         },
         fillPatternScales: {
           size: 1,
+          stepMode: 'dynamic',
           accessor: 'getFillPatternScale',
-          defaultValue: 1,
-          shaderAttributes: {
-            fillPatternScales: {
-              divisor: 0
-            },
-            instanceFillPatternScales: {
-              divisor: 1
-            }
-          }
+          defaultValue: 1
         },
         fillPatternOffsets: {
           size: 2,
-          accessor: 'getFillPatternOffset',
-          shaderAttributes: {
-            fillPatternOffsets: {
-              divisor: 0
-            },
-            instanceFillPatternOffsets: {
-              divisor: 1
-            }
-          }
+          stepMode: 'dynamic',
+          accessor: 'getFillPatternOffset'
         }
       });
     }

package/src/fill-style/shader-module.ts

@@ -9,19 +9,9 @@ import {glsl} from '../utils/syntax-tags';
  * fill pattern shader module
  */
 const patternVs = glsl`
-#ifdef NON_INSTANCED_MODEL
-  #define FILL_PATTERN_FRAME_ATTRIB fillPatternFrames
-  #define FILL_PATTERN_SCALE_ATTRIB fillPatternScales
-  #define FILL_PATTERN_OFFSET_ATTRIB fillPatternOffsets
-#else
-  #define FILL_PATTERN_FRAME_ATTRIB instanceFillPatternFrames
-  #define FILL_PATTERN_SCALE_ATTRIB instanceFillPatternScales
-  #define FILL_PATTERN_OFFSET_ATTRIB instanceFillPatternOffsets
-#endif
-
-in vec4 FILL_PATTERN_FRAME_ATTRIB;
-in float FILL_PATTERN_SCALE_ATTRIB;
-in vec2 FILL_PATTERN_OFFSET_ATTRIB;
+in vec4 fillPatternFrames;
+in float fillPatternScales;
+in vec2 fillPatternOffsets;
 
 uniform bool fill_patternEnabled;
 uniform vec2 fill_patternTextureSize;
@@ -52,9 +42,9 @@ const inject = {
 
   'vs:DECKGL_FILTER_COLOR': glsl`
     if (fill_patternEnabled) {
-      fill_patternBounds = FILL_PATTERN_FRAME_ATTRIB / vec4(fill_patternTextureSize, fill_patternTextureSize);
-      fill_patternPlacement.xy = FILL_PATTERN_OFFSET_ATTRIB;
-      fill_patternPlacement.zw = FILL_PATTERN_SCALE_ATTRIB * FILL_PATTERN_FRAME_ATTRIB.zw;
+      fill_patternBounds = fillPatternFrames / vec4(fill_patternTextureSize, fill_patternTextureSize);
+      fill_patternPlacement.xy = fillPatternOffsets;
+      fill_patternPlacement.zw = fillPatternScales * fillPatternFrames.zw;
     }
   `,