@zephyr3d/device 0.2.3 → 0.2.5

package/dist/builder/reflection.js.map

@@ -1 +1 @@
-{"version":3,"file":"reflection.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"reflection.js","sources":["../../src/builder/reflection.ts"],"sourcesContent":["import type { PBGlobalScope, ProgramBuilder } from './programbuilder';\r\nimport type { PBShaderExp } from './base';\r\nimport type { VertexSemantic } from '../gpuobject';\r\n\r\n/**\r\n * Shader variable getter function type\r\n * @public\r\n */\r\nexport type PBReflectionTagGetter = (scope: PBGlobalScope) => PBShaderExp;\r\n\r\n/**\r\n * Reflection interface for program builder\r\n * @public\r\n */\r\nexport class PBReflection {\r\n  /** @internal */\r\n  private readonly _builder: ProgramBuilder;\r\n  /** @internal */\r\n  private _tagList: Record<string, PBReflectionTagGetter>;\r\n  /** @internal */\r\n  private _attribList: Record<string, PBShaderExp>;\r\n  constructor(builder: ProgramBuilder) {\r\n    this._builder = builder;\r\n    this._tagList = {};\r\n    this._attribList = {};\r\n  }\r\n  /** Gets all the vertex attributes that was used by the program */\r\n  get vertexAttributes(): number[] {\r\n    return this._builder.getVertexAttributes();\r\n  }\r\n  /**\r\n   * Check if specified vertex attribute was used by the program\r\n   * @param attrib - The vertex attribute to check\r\n   */\r\n  hasVertexAttribute(attrib: number): boolean {\r\n    return this.vertexAttributes.indexOf(attrib) >= 0;\r\n  }\r\n  /**\r\n   * Clear all contents\r\n   */\r\n  clear(): void {\r\n    this._tagList = {};\r\n    this._attribList = {};\r\n  }\r\n  /**\r\n   * Gets the variable that has tagged with given string\r\n   * @param name - The tag string\r\n   */\r\n  tag(name: string): PBShaderExp;\r\n  /**\r\n   * Creates a new tag by specifying a function to get the tagged variable\r\n   * @param name - The tag name\r\n   * @param getter - The getter function\r\n   */\r\n  tag(name: string, getter: PBReflectionTagGetter): void;\r\n  /**\r\n   * Creates multiple tags from an object that contains the tag names and the getter functions\r\n   * @param values - The object that contains the tag names and the getter functions\r\n   */\r\n  tag(values: Record<string, PBReflectionTagGetter>): void;\r\n  tag(\r\n    arg0: string | Record<string, PBReflectionTagGetter>,\r\n    arg1?: PBReflectionTagGetter\r\n  ): PBShaderExp | void {\r\n    if (typeof arg0 === 'string') {\r\n      if (arg1 === undefined) {\r\n        return this.getTag(arg0);\r\n      } else {\r\n        this.addTag(arg0, arg1);\r\n      }\r\n    } else {\r\n      for (const k of Object.keys(arg0)) {\r\n        this.addTag(k, arg0[k]);\r\n      }\r\n    }\r\n  }\r\n  /**\r\n   * Gets the variable which is the vertex attribute of specified semantic\r\n   * @param attrib - The vertex semantic\r\n   */\r\n  attribute(attrib: VertexSemantic): PBShaderExp {\r\n    return this._attribList[attrib] || null;\r\n  }\r\n  /** @internal */\r\n  setAttrib(attrib: VertexSemantic, exp: PBShaderExp) {\r\n    this._attribList[attrib] = exp;\r\n  }\r\n  /** @internal */\r\n  private addTag(name: string, exp: PBReflectionTagGetter): void {\r\n    this._tagList[name] = exp;\r\n  }\r\n  /** @internal */\r\n  private getTag(name: string): PBShaderExp {\r\n    const getter = this._tagList[name];\r\n    return getter ? getter(this._builder.getGlobalScope()) : null;\r\n  }\r\n}\r\n"],"names":["PBReflection","builder","_builder","_tagList","_attribList","vertexAttributes","getVertexAttributes","hasVertexAttribute","attrib","indexOf","clear","tag","arg0","arg1","undefined","getTag","addTag","k","Object","keys","attribute","setAttrib","exp","name","getter","getGlobalScope"],"mappings":"AAUA;;;AAGC,IACM,MAAMA,YAAAA,CAAAA;qBAEX,QAA0C;qBAE1C,QAAwD;qBAExD,WAAiD;AACjD,IAAA,WAAA,CAAYC,OAAuB,CAAE;QACnC,IAAI,CAACC,QAAQ,GAAGD,OAAAA;QAChB,IAAI,CAACE,QAAQ,GAAG,EAAC;QACjB,IAAI,CAACC,WAAW,GAAG,EAAC;AACtB;uEAEA,IAAIC,gBAA6B,GAAA;AAC/B,QAAA,OAAO,IAAI,CAACH,QAAQ,CAACI,mBAAmB,EAAA;AAC1C;AACA;;;MAIAC,kBAAAA,CAAmBC,MAAc,EAAW;AAC1C,QAAA,OAAO,IAAI,CAACH,gBAAgB,CAACI,OAAO,CAACD,MAAW,CAAA,IAAA,CAAA;AAClD;AACA;;AAEC,MACDE,KAAc,GAAA;QACZ,IAAI,CAACP,QAAQ,GAAG,EAAC;QACjB,IAAI,CAACC,WAAW,GAAG,EAAC;AACtB;IAiBAO,GACEC,CAAAA,IAAoD,EACpDC,IAA4B,EACR;QACpB,IAAI,OAAOD,SAAS,QAAU,EAAA;AAC5B,YAAA,IAAIC,SAASC,SAAW,EAAA;gBACtB,OAAO,IAAI,CAACC,MAAM,CAACH,IAAAA,CAAAA;aACd,MAAA;gBACL,IAAI,CAACI,MAAM,CAACJ,IAAMC,EAAAA,IAAAA,CAAAA;AACpB;SACK,MAAA;AACL,YAAA,KAAK,MAAMI,CAAAA,IAAKC,MAAOC,CAAAA,IAAI,CAACP,IAAO,CAAA,CAAA;AACjC,gBAAA,IAAI,CAACI,MAAM,CAACC,CAAGL,EAAAA,IAAI,CAACK,CAAE,CAAA,CAAA;AACxB;AACF;AACF;AACA;;;MAIAG,SAAAA,CAAUZ,MAAsB,EAAe;AAC7C,QAAA,OAAO,IAAI,CAACJ,WAAW,CAACI,OAAO,IAAI,IAAA;AACrC;AACA,qBACAa,SAAAA,CAAUb,MAAsB,EAAEc,GAAgB,EAAE;AAClD,QAAA,IAAI,CAAClB,WAAW,CAACI,MAAAA,CAAO,GAAGc,GAAAA;AAC7B;AACA,qBACA,MAAQN,CAAOO,IAAY,EAAED,GAA0B,EAAQ;AAC7D,QAAA,IAAI,CAACnB,QAAQ,CAACoB,IAAAA,CAAK,GAAGD,GAAAA;AACxB;AACA,qBACQP,MAAOQ,CAAAA,IAAY,EAAe;AACxC,QAAA,MAAMC,MAAS,GAAA,IAAI,CAACrB,QAAQ,CAACoB,IAAK,CAAA;AAClC,QAAA,OAAOC,SAASA,MAAO,CAAA,IAAI,CAACtB,QAAQ,CAACuB,cAAc,EAAM,CAAA,GAAA,IAAA;AAC3D;AACF;;;;"}

package/dist/builder/types.js

@@ -1,3 +1,5 @@
+import { ASSERT } from '@zephyr3d/base';
+
 const F16_BITMASK = 1;
 const F32_BITMASK = 2;
 const BOOL_BITMASK = 3;
@@ -32,7 +34,7 @@ function getAlignment(type) {
         return Math.max(alignment, 16);
     }
 }
-function getAlignmentPacked(type) {
+function getAlignmentPacked(_type) {
     return 1;
 }
 function getSize(type) {
@@ -100,8 +102,10 @@ function typeToTypedArray(type) {
         return PBPrimitiveType.U8;
     }
 }
-var PBPrimitiveType;
-(function(PBPrimitiveType) {
+/**
+ * Primitive types
+ * @public
+ */ var PBPrimitiveType = /*#__PURE__*/ function(PBPrimitiveType) {
     PBPrimitiveType[PBPrimitiveType["NONE"] = 0] = "NONE";
     PBPrimitiveType[PBPrimitiveType["F16"] = makePrimitiveType(F16_BITMASK, 1, 1, 0)] = "F16";
     PBPrimitiveType[PBPrimitiveType["F16VEC2"] = makePrimitiveType(F16_BITMASK, 1, 2, 0)] = "F16VEC2";
@@ -172,7 +176,8 @@ var PBPrimitiveType;
     PBPrimitiveType[PBPrimitiveType["MAT4x2"] = makePrimitiveType(F32_BITMASK, 4, 2, 0)] = "MAT4x2";
     PBPrimitiveType[PBPrimitiveType["MAT4x3"] = makePrimitiveType(F32_BITMASK, 4, 3, 0)] = "MAT4x3";
     PBPrimitiveType[PBPrimitiveType["MAT4"] = makePrimitiveType(F32_BITMASK, 4, 4, 0)] = "MAT4";
-})(PBPrimitiveType || (PBPrimitiveType = {}));
+    return PBPrimitiveType;
+}({});
 const primitiveTypeMapWebGL = {
     [PBPrimitiveType.F32]: 'float',
     [PBPrimitiveType.F32VEC2]: 'vec2',
@@ -239,8 +244,10 @@ const BITFLAG_FLOAT = 1 << 8;
 const BITFLAG_INT = 1 << 9;
 const BITFLAG_UINT = 1 << 10;
 const BITFLAG_EXTERNAL = 1 << 11;
-var PBTextureType;
-(function(PBTextureType) {
+/**
+ * Texture types
+ * @public
+ */ var PBTextureType = /*#__PURE__*/ function(PBTextureType) {
     PBTextureType[PBTextureType["TEX_1D"] = BITFLAG_1D | BITFLAG_FLOAT] = "TEX_1D";
     PBTextureType[PBTextureType["ITEX_1D"] = BITFLAG_1D | BITFLAG_INT] = "ITEX_1D";
     PBTextureType[PBTextureType["UTEX_1D"] = BITFLAG_1D | BITFLAG_UINT] = "UTEX_1D";
@@ -272,7 +279,8 @@ var PBTextureType;
     PBTextureType[PBTextureType["TEX_DEPTH_CUBE_ARRAY"] = BITFLAG_CUBE | BITFLAG_ARRAY | BITFLAG_DEPTH] = "TEX_DEPTH_CUBE_ARRAY";
     PBTextureType[PBTextureType["TEX_DEPTH_MULTISAMPLED_2D"] = BITFLAG_2D | BITFLAG_MULTISAMPLED | BITFLAG_DEPTH] = "TEX_DEPTH_MULTISAMPLED_2D";
     PBTextureType[PBTextureType["TEX_EXTERNAL"] = BITFLAG_EXTERNAL] = "TEX_EXTERNAL";
-})(PBTextureType || (PBTextureType = {}));
+    return PBTextureType;
+}({});
 const textureTypeMapWebGL = {
     [PBTextureType.TEX_1D]: 'highp sampler2D',
     [PBTextureType.TEX_2D]: 'highp sampler2D',
@@ -352,35 +360,27 @@ const storageTexelFormatMap = {
     rgba32ui: 'rgba32uint',
     rgba32i: 'rgba32sint'
 };
-var PBSamplerAccessMode;
-(function(PBSamplerAccessMode) {
+/**
+ * Sampler access mode
+ * @public
+ */ var PBSamplerAccessMode = /*#__PURE__*/ function(PBSamplerAccessMode) {
     PBSamplerAccessMode[PBSamplerAccessMode["UNKNOWN"] = 0] = "UNKNOWN";
     PBSamplerAccessMode[PBSamplerAccessMode["SAMPLE"] = 1] = "SAMPLE";
     PBSamplerAccessMode[PBSamplerAccessMode["COMPARISON"] = 2] = "COMPARISON";
-})(PBSamplerAccessMode || (PBSamplerAccessMode = {}));
-var PBAddressSpace;
-(function(PBAddressSpace) {
-    PBAddressSpace["UNKNOWN"] = 'unknown';
-    PBAddressSpace["FUNCTION"] = 'function';
-    PBAddressSpace["PRIVATE"] = 'private';
-    PBAddressSpace["WORKGROUP"] = 'workgroup';
-    PBAddressSpace["UNIFORM"] = 'uniform';
-    PBAddressSpace["STORAGE"] = 'storage';
-})(PBAddressSpace || (PBAddressSpace = {}));
-var PBTypeClass;
-(function(PBTypeClass) {
-    PBTypeClass[PBTypeClass["UNKNOWN"] = 0] = "UNKNOWN";
-    PBTypeClass[PBTypeClass["PLAIN"] = 1] = "PLAIN";
-    PBTypeClass[PBTypeClass["ARRAY"] = 2] = "ARRAY";
-    PBTypeClass[PBTypeClass["POINTER"] = 3] = "POINTER";
-    PBTypeClass[PBTypeClass["ATOMIC_I32"] = 4] = "ATOMIC_I32";
-    PBTypeClass[PBTypeClass["ATOMIC_U32"] = 5] = "ATOMIC_U32";
-    PBTypeClass[PBTypeClass["TEXTURE"] = 6] = "TEXTURE";
-    PBTypeClass[PBTypeClass["SAMPLER"] = 7] = "SAMPLER";
-    PBTypeClass[PBTypeClass["FUNCTION"] = 8] = "FUNCTION";
-    PBTypeClass[PBTypeClass["VOID"] = 9] = "VOID";
-    PBTypeClass[PBTypeClass["ANY"] = 10] = "ANY";
-})(PBTypeClass || (PBTypeClass = {}));
+    return PBSamplerAccessMode;
+}({});
+/**
+ * Shader variable address space
+ * @public
+ */ var PBAddressSpace = /*#__PURE__*/ function(PBAddressSpace) {
+    PBAddressSpace["UNKNOWN"] = "unknown";
+    PBAddressSpace["FUNCTION"] = "function";
+    PBAddressSpace["PRIVATE"] = "private";
+    PBAddressSpace["WORKGROUP"] = "workgroup";
+    PBAddressSpace["UNIFORM"] = "uniform";
+    PBAddressSpace["STORAGE"] = "storage";
+    return PBAddressSpace;
+}({});
 /**
  * Abstract base class for any type
  * @public
@@ -441,7 +441,7 @@ var PBTypeClass;
     /** @internal */ isStorable() {
         return false;
     }
-    /** @internal */ getConstructorOverloads(deviceType) {
+    /** @internal */ getConstructorOverloads(_deviceType) {
         return [];
     }
     /**
@@ -457,18 +457,18 @@ var PBTypeClass;
  * @public
  */ class PBVoidTypeInfo extends PBTypeInfo {
     constructor(){
-        super(PBTypeClass.VOID, null);
+        super(9, null);
     }
     /** {@inheritDoc PBTypeInfo.isVoidType} */ isVoidType() {
         return true;
     }
-    /** @internal */ toTypeName(deviceType, varName) {
+    /** @internal */ toTypeName() {
         return 'void';
     }
     /** @internal */ genTypeId() {
         return 'void';
     }
-    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(offset) {
+    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(_offset) {
         return null;
     }
 }
@@ -477,21 +477,21 @@ var PBTypeClass;
  * @public
  */ class PBAnyTypeInfo extends PBTypeInfo {
     constructor(){
-        super(PBTypeClass.ANY, null);
+        super(10, null);
     }
     /** {@inheritDoc PBTypeInfo.isAnyType} */ isAnyType() {
         return true;
     }
-    /** @internal */ toTypeName(deviceType, varName) {
+    /** @internal */ toTypeName() {
         return 'any';
     }
     /** @internal */ genTypeId() {
         return 'any';
     }
-    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(offset) {
+    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(_offset) {
         return null;
     }
-    /** {@inheritDoc PBTypeInfo.isCompatibleType} */ isCompatibleType(other) {
+    /** {@inheritDoc PBTypeInfo.isCompatibleType} */ isCompatibleType(_other) {
         return true;
     }
 }
@@ -502,7 +502,7 @@ var PBTypeClass;
     /** @internal */ static cachedTypes = {};
     /** @internal */ static cachedCtorOverloads = {};
     constructor(type){
-        super(PBTypeClass.PLAIN, {
+        super(1, {
             primitiveType: type
         });
     }
@@ -785,7 +785,7 @@ var PBTypeClass;
             return varName ? `${typename} ${varName}` : typename;
         }
     }
-    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(offset) {
+    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(_offset) {
         return null;
     }
     /** @internal */ genTypeId() {
@@ -797,7 +797,7 @@ var PBTypeClass;
  * @public
  */ class PBStructTypeInfo extends PBTypeInfo {
     constructor(name, layout, members){
-        super(PBTypeClass.PLAIN, {
+        super(1, {
             layout: layout || 'default',
             structName: name,
             structMembers: members.map((val)=>{
@@ -979,7 +979,7 @@ var PBTypeClass;
     }
     /** @internal */ calcAlignmentAndSizePacked() {
         for (const member of this.structMembers){
-            member.alignment = getAlignmentPacked(member.type);
+            member.alignment = getAlignmentPacked();
             member.size = getSizePacked(member.type);
         }
     }
@@ -989,7 +989,7 @@ var PBTypeClass;
  * @public
  */ class PBArrayTypeInfo extends PBTypeInfo {
     constructor(elementType, dimension){
-        super(PBTypeClass.ARRAY, {
+        super(2, {
             elementType: elementType,
             dimension: Number(dimension) || 0
         });
@@ -1039,8 +1039,8 @@ var PBTypeClass;
             const typename = `array<${elementTypeName}${this.dimension ? ', ' + this.dimension : ''}>`;
             return varName ? `${varName}: ${typename}` : typename;
         } else {
-            console.assert(!!this.dimension, 'runtime-sized array not supported for webgl');
-            console.assert(!this.elementType.isArrayType(), 'multi-dimensional arrays not supported for webgl');
+            ASSERT(!!this.dimension, 'runtime-sized array not supported for webgl');
+            ASSERT(!this.elementType.isArrayType(), 'multi-dimensional arrays not supported for webgl');
             const elementTypeName = this.elementType.toTypeName(deviceType, varName);
             return `${elementTypeName}[${this.dimension}]`;
         }
@@ -1056,7 +1056,7 @@ var PBTypeClass;
         }
         return this.elementType.isAnyType() ? 0 : this.dimension * align(this.elementType.getLayoutSize(layout), elementAlignment);
     }
-    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(offset) {
+    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(_offset) {
         return null;
     }
     isCompatibleType(other) {
@@ -1078,11 +1078,11 @@ var PBTypeClass;
  */ class PBPointerTypeInfo extends PBTypeInfo {
     /** @internal */ writable;
     constructor(pointerType, addressSpace){
-        super(PBTypeClass.POINTER, {
+        super(3, {
             pointerType,
             addressSpace
         });
-        console.assert(pointerType.isStorable(), 'the pointee type must be storable');
+        ASSERT(pointerType.isStorable(), 'the pointee type must be storable');
         this.writable = false;
     }
     /** Get type of the pointer */ get pointerType() {
@@ -1105,7 +1105,7 @@ var PBTypeClass;
     }
     /** @internal */ toTypeName(device, varName) {
         if (device === 'webgpu') {
-            const addressSpace = this.addressSpace === PBAddressSpace.UNKNOWN ? PBAddressSpace.FUNCTION : this.addressSpace;
+            const addressSpace = this.addressSpace === "unknown" ? "function" : this.addressSpace;
             /*
       const mode = addressSpace === PBAddressSpace.UNIFORM || (addressSpace === PBAddressSpace.STORAGE && !this.writable) ? 'read' : 'read_write'
       const typename = `ptr<${addressSpace}, ${this.pointerType.toTypeName(device)}, ${mode}>`;
@@ -1113,14 +1113,14 @@ var PBTypeClass;
         When writing a variable declaration or a pointer type in WGSL source:
         For the storage address space, the access mode is optional, and defaults to read.
         For other address spaces, the access mode must not be written.
-      */ const mode = addressSpace === PBAddressSpace.STORAGE && this.writable ? ', read_write' : '';
+      */ const mode = addressSpace === "storage" && this.writable ? ', read_write' : '';
             const typename = `ptr<${addressSpace}, ${this.pointerType.toTypeName(device)} ${mode}>`;
             return varName ? `${varName}: ${typename}` : typename;
         } else {
             throw new Error('pointer type not supported for webgl');
         }
     }
-    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(offset) {
+    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(_offset) {
         return null;
     }
     /** @internal */ genTypeId() {
@@ -1132,7 +1132,7 @@ var PBTypeClass;
  * @public
  */ class PBAtomicI32TypeInfo extends PBTypeInfo {
     constructor(){
-        super(PBTypeClass.ATOMIC_I32, null);
+        super(4, null);
     }
     /** {@inheritDoc PBTypeInfo.isPointerType} */ haveAtomicMembers() {
         return true;
@@ -1154,10 +1154,10 @@ var PBTypeClass;
             throw new Error('atomic type not supported for webgl');
         }
     }
-    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(offset) {
+    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(_offset) {
         return null;
     }
-    /** @internal */ getLayoutAlignment(layout) {
+    /** @internal */ getLayoutAlignment(_layout) {
         return 4;
     }
     /** @internal */ getLayoutSize() {
@@ -1175,7 +1175,7 @@ var PBTypeClass;
  * @public
  */ class PBAtomicU32TypeInfo extends PBTypeInfo {
     constructor(){
-        super(PBTypeClass.ATOMIC_U32, null);
+        super(5, null);
     }
     /** {@inheritDoc PBTypeInfo.isPointerType} */ haveAtomicMembers() {
         return true;
@@ -1197,10 +1197,10 @@ var PBTypeClass;
             throw new Error('atomic type not supported for webgl');
         }
     }
-    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(offset) {
+    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(_offset) {
         return null;
     }
-    /** @internal */ getLayoutAlignment(layout) {
+    /** @internal */ getLayoutAlignment(_layout) {
         return 4;
     }
     /** @internal */ getLayoutSize() {
@@ -1218,7 +1218,7 @@ var PBTypeClass;
  * @public
  */ class PBSamplerTypeInfo extends PBTypeInfo {
     constructor(accessMode){
-        super(PBTypeClass.SAMPLER, {
+        super(7, {
             accessMode: accessMode
         });
     }
@@ -1233,13 +1233,13 @@ var PBTypeClass;
     }
     /** @internal */ toTypeName(deviceType, varName) {
         if (deviceType === 'webgpu') {
-            const typename = this.accessMode === PBSamplerAccessMode.SAMPLE ? 'sampler' : 'sampler_comparison';
+            const typename = this.accessMode === 1 ? 'sampler' : 'sampler_comparison';
             return varName ? `${varName}: ${typename}` : typename;
         } else {
             throw new Error('sampler type not supported for webgl');
         }
     }
-    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(offset) {
+    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(_offset) {
         return null;
     }
     /** @internal */ genTypeId() {
@@ -1251,14 +1251,14 @@ var PBTypeClass;
  * @public
  */ class PBTextureTypeInfo extends PBTypeInfo {
     constructor(textureType, texelFormat, readable, writable){
-        super(PBTypeClass.TEXTURE, {
+        super(6, {
             textureType: textureType,
             readable,
             writable,
             storageTexelFormat: texelFormat || null
         });
-        console.assert(!!textureTypeMapWGSL[textureType], 'unsupported texture type');
-        console.assert(!(textureType & BITFLAG_STORAGE) || !!storageTexelFormatMap[texelFormat], 'invalid texel format for storage texture');
+        ASSERT(!!textureTypeMapWGSL[textureType], 'unsupported texture type');
+        ASSERT(!(textureType & BITFLAG_STORAGE) || !!storageTexelFormatMap[texelFormat], 'invalid texel format for storage texture');
     }
     /** Get the texture type */ get textureType() {
         return this.detail.textureType;
@@ -1329,15 +1329,15 @@ var PBTypeClass;
             return varName ? `${varName}: ${typename}` : typename;
         } else {
             const typename = (deviceType === 'webgl' ? textureTypeMapWebGL : textureTypeMapWebGL2)[this.textureType];
-            console.assert(!!typename, 'unsupported texture type');
+            ASSERT(!!typename, 'unsupported texture type');
             return varName ? `${typename} ${varName}` : typename;
         }
     }
-    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(offset) {
+    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(_offset) {
         return null;
     }
     /** @internal */ genTypeId() {
-        return `TEXTURE:${this.textureType}`;
+        return `TEXTURE:${this.textureType}:${this.textureType & BITFLAG_STORAGE ? this.storageTexelFormat : ''}`;
     }
 }
 /**
@@ -1345,7 +1345,7 @@ var PBTypeClass;
  * @public
  */ class PBFunctionTypeInfo extends PBTypeInfo {
     constructor(name, returnType, argTypes){
-        super(PBTypeClass.FUNCTION, {
+        super(8, {
             name,
             returnType,
             argTypes
@@ -1366,10 +1366,10 @@ var PBTypeClass;
     /** @internal */ genTypeId() {
         return `fn(${this.argHash}):${this.returnType.typeId}`;
     }
-    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(offset) {
+    /** {@inheritDoc PBTypeInfo.toBufferLayout} */ toBufferLayout(_offset) {
         return null;
     }
-    /** @internal */ toTypeName(deviceType, varName) {
+    /** @internal */ toTypeName() {
         throw new Error('not supported');
     }
 }
@@ -1539,8 +1539,8 @@ var PBTypeClass;
 /** @internal */ const typeTexDepthCube = new PBTextureTypeInfo(PBTextureType.TEX_DEPTH_CUBE);
 /** @internal */ const typeTexDepthCubeArray = new PBTextureTypeInfo(PBTextureType.TEX_DEPTH_CUBE_ARRAY);
 /** @internal */ const typeTexDepthMultisampled2D = new PBTextureTypeInfo(PBTextureType.TEX_DEPTH_MULTISAMPLED_2D);
-/** @internal */ const typeSampler = new PBSamplerTypeInfo(PBSamplerAccessMode.SAMPLE);
-/** @internal */ const typeSamplerComparison = new PBSamplerTypeInfo(PBSamplerAccessMode.COMPARISON);
+/** @internal */ const typeSampler = new PBSamplerTypeInfo(1);
+/** @internal */ const typeSamplerComparison = new PBSamplerTypeInfo(2);
 /** @internal */ const typeVoid = new PBVoidTypeInfo();
 /** @internal */ const typeAny = new PBAnyTypeInfo();
 /** @internal */ const typeFrexpResult = new PBStructTypeInfo('FrexpResult', 'default', [