@zephyr3d/device 0.2.5 → 0.2.6

package/dist/builder/reflection.js

@@ -42,7 +42,7 @@
    * Gets the variable which is the vertex attribute of specified semantic
    * @param attrib - The vertex semantic
    */ attribute(attrib) {
-        return this._attribList[attrib] || null;
+        return this._attribList[attrib] ?? null;
     }
     /** @internal */ setAttrib(attrib, exp) {
         this._attribList[attrib] = exp;

package/dist/builder/reflection.js.map

@@ -1 +1 @@
-{"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;;;;"}
+{"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\nimport type { Nullable } from '@zephyr3d/base';\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: Partial<Record<string, PBReflectionTagGetter>>;\r\n  /** @internal */\r\n  private _attribList: Partial<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() {\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) {\r\n    return this.vertexAttributes.indexOf(attrib) >= 0;\r\n  }\r\n  /**\r\n   * Clear all contents\r\n   */\r\n  clear() {\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  ): Nullable<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) {\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) {\r\n    this._tagList[name] = exp;\r\n  }\r\n  /** @internal */\r\n  private getTag(name: string) {\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":"AAWA;;;AAGC,IACM,MAAMA,YAAAA,CAAAA;qBAEX,QAA0C;qBAE1C,QAAiE;qBAEjE,WAA0D;AAC1D,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,gBAAmB,GAAA;AACrB,QAAA,OAAO,IAAI,CAACH,QAAQ,CAACI,mBAAmB,EAAA;AAC1C;AACA;;;MAIAC,kBAAAA,CAAmBC,MAAc,EAAE;AACjC,QAAA,OAAO,IAAI,CAACH,gBAAgB,CAACI,OAAO,CAACD,MAAW,CAAA,IAAA,CAAA;AAClD;AACA;;AAEC,MACDE,KAAQ,GAAA;QACN,IAAI,CAACP,QAAQ,GAAG,EAAC;QACjB,IAAI,CAACC,WAAW,GAAG,EAAC;AACtB;IAiBAO,GACEC,CAAAA,IAAoD,EACpDC,IAA4B,EACE;QAC9B,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;AAChC,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,EAAE;AACvD,QAAA,IAAI,CAACnB,QAAQ,CAACoB,IAAAA,CAAK,GAAGD,GAAAA;AACxB;AACA,qBACQP,MAAOQ,CAAAA,IAAY,EAAE;AAC3B,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

@@ -841,6 +841,7 @@ const storageTexelFormatMap = {
                 return member.type.isAtomicI32() || member.type.isAtomicU32();
             }
         }
+        return false;
     }
     /**
    * Creates a new struct type by extending this type
@@ -1014,7 +1015,7 @@ const storageTexelFormatMap = {
         return this.detail.elementType.isHostSharable();
     }
     /** @internal */ isConstructible() {
-        return this.dimension && this.detail.elementType.isConstructible();
+        return !!this.dimension && this.detail.elementType.isConstructible();
     }
     /** @internal */ isStorable() {
         return true;
@@ -1253,12 +1254,12 @@ const storageTexelFormatMap = {
     constructor(textureType, texelFormat, readable, writable){
         super(6, {
             textureType: textureType,
-            readable,
-            writable,
-            storageTexelFormat: texelFormat || null
+            readable: readable ?? false,
+            writable: writable ?? false,
+            storageTexelFormat: texelFormat ?? null
         });
         ASSERT(!!textureTypeMapWGSL[textureType], 'unsupported texture type');
-        ASSERT(!(textureType & BITFLAG_STORAGE) || !!storageTexelFormatMap[texelFormat], 'invalid texel format for storage texture');
+        ASSERT(!(textureType & BITFLAG_STORAGE) || !!texelFormat && texelFormat in storageTexelFormatMap, `invalid texel format for storage texture: ${texelFormat}`);
     }
     /** Get the texture type */ get textureType() {
         return this.detail.textureType;
@@ -1328,7 +1329,7 @@ const storageTexelFormatMap = {
             }
             return varName ? `${varName}: ${typename}` : typename;
         } else {
-            const typename = (deviceType === 'webgl' ? textureTypeMapWebGL : textureTypeMapWebGL2)[this.textureType];
+            const typename = deviceType === 'webgl' ? textureTypeMapWebGL[this.textureType] : textureTypeMapWebGL2[this.textureType];
             ASSERT(!!typename, 'unsupported texture type');
             return varName ? `${typename} ${varName}` : typename;
         }