@luma.gl/core 9.1.9 → 9.2.0-alpha.3

package/dist/adapter/resources/texture.js

@@ -2,43 +2,40 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { Resource } from "./resource.js";
+import { Sampler } from "./sampler.js";
+import { log } from "../../utils/log.js";
+const BASE_DIMENSIONS = {
+    '1d': '1d',
+    '2d': '2d',
+    '2d-array': '2d',
+    cube: '2d',
+    'cube-array': '2d',
+    '3d': '3d'
+};
 /**
  * Abstract Texture interface
  * Texture Object
  * https://gpuweb.github.io/gpuweb/#gputexture
  */
 export class Texture extends Resource {
+    /** The texture can be bound for use as a sampled texture in a shader */
+    static SAMPLE = 0x04;
+    /** The texture can be bound for use as a storage texture in a shader */
+    static STORAGE = 0x08;
+    /** The texture can be used as a color or depth/stencil attachment in a render pass */
+    static RENDER = 0x10;
+    /** The texture can be used as the source of a copy operation */
     static COPY_SRC = 0x01;
+    /** he texture can be used as the destination of a copy or write operation */
     static COPY_DST = 0x02;
+    /** @deprecated Use Texture.SAMPLE */
     static TEXTURE = 0x04;
-    static STORAGE = 0x08;
+    /** @deprecated Use Texture.RENDER */
     static RENDER_ATTACHMENT = 0x10;
-    static CubeFaces = ['+X', '-X', '+Y', '-Y', '+Z', '-Z'];
-    static defaultProps = {
-        ...Resource.defaultProps,
-        data: null,
-        dimension: '2d',
-        format: 'rgba8unorm',
-        width: undefined,
-        height: undefined,
-        depth: 1,
-        mipmaps: false,
-        compressed: false,
-        usage: 0,
-        mipLevels: undefined,
-        samples: undefined,
-        sampler: {},
-        view: undefined,
-        flipY: undefined
-    };
-    get [Symbol.toStringTag]() {
-        return 'Texture';
-    }
-    toString() {
-        return `Texture(${this.id},${this.format},${this.width}x${this.height})`;
-    }
     /** dimension of this texture */
     dimension;
+    /** base dimension of this texture */
+    baseDimension;
     /** format of this texture */
     format;
     /** width in pixels of this texture */
@@ -51,147 +48,151 @@ export class Texture extends Resource {
     mipLevels;
     /** "Time" of last update. Monotonically increasing timestamp. TODO move to AsyncTexture? */
     updateTimestamp;
+    get [Symbol.toStringTag]() {
+        return 'Texture';
+    }
+    toString() {
+        return `Texture(${this.id},${this.format},${this.width}x${this.height})`;
+    }
     /** Do not use directly. Create with device.createTexture() */
     constructor(device, props) {
         props = Texture.normalizeProps(device, props);
         super(device, props, Texture.defaultProps);
         this.dimension = this.props.dimension;
+        this.baseDimension = BASE_DIMENSIONS[this.dimension];
         this.format = this.props.format;
         // Size
         this.width = this.props.width;
         this.height = this.props.height;
         this.depth = this.props.depth;
+        this.mipLevels = this.props.mipLevels;
         // Calculate size, if not provided
         if (this.props.width === undefined || this.props.height === undefined) {
-            // @ts-ignore
-            const size = Texture.getTextureDataSize(this.props.data);
-            this.width = size?.width || 1;
-            this.height = size?.height || 1;
-        }
-        // mipLevels
-        // If mipmap generation is requested and mipLevels is not provided, initialize a full pyramid
-        if (this.props.mipmaps && this.props.mipLevels === undefined) {
-            this.props.mipLevels = 'pyramid';
+            if (device.isExternalImage(props.data)) {
+                const size = device.getExternalImageSize(props.data);
+                this.width = size?.width || 1;
+                this.height = size?.height || 1;
+            }
+            else {
+                this.width = 1;
+                this.height = 1;
+                if (this.props.width === undefined || this.props.height === undefined) {
+                    log.warn(`${this} created with undefined width or height. This is deprecated. Use AsyncTexture instead.`)();
+                }
+            }
         }
-        // Auto-calculate the number of mip levels as a convenience
-        // TODO - Should we clamp to 1-getMipLevelCount?
-        this.mipLevels =
-            this.props.mipLevels === 'pyramid'
-                ? Texture.getMipLevelCount(this.width, this.height)
-                : this.props.mipLevels || 1;
         // TODO - perhaps this should be set on async write completion?
         this.updateTimestamp = device.incrementTimestamp();
     }
+    /** Set sampler props associated with this texture */
+    setSampler(sampler) {
+        this.sampler = sampler instanceof Sampler ? sampler : this.device.createSampler(sampler);
+    }
     /**
-     * Create a new texture with the same parameters and optionally, a different size
+     * Create a new texture with the same parameters and optionally a different size
      * @note Textures are immutable and cannot be resized after creation, but we can create a similar texture with the same parameters but a new size.
      * @note Does not copy contents of the texture
      */
     clone(size) {
         return this.device.createTexture({ ...this.props, ...size });
     }
-    /** Check if data is an external image */
-    static isExternalImage(data) {
-        return ((typeof ImageData !== 'undefined' && data instanceof ImageData) ||
-            (typeof ImageBitmap !== 'undefined' && data instanceof ImageBitmap) ||
-            (typeof HTMLImageElement !== 'undefined' && data instanceof HTMLImageElement) ||
-            (typeof HTMLVideoElement !== 'undefined' && data instanceof HTMLVideoElement) ||
-            (typeof VideoFrame !== 'undefined' && data instanceof VideoFrame) ||
-            (typeof HTMLCanvasElement !== 'undefined' && data instanceof HTMLCanvasElement) ||
-            (typeof OffscreenCanvas !== 'undefined' && data instanceof OffscreenCanvas));
-    }
-    /** Determine size (width and height) of provided image data */
-    static getExternalImageSize(data) {
-        if ((typeof ImageData !== 'undefined' && data instanceof ImageData) ||
-            (typeof ImageBitmap !== 'undefined' && data instanceof ImageBitmap) ||
-            (typeof HTMLCanvasElement !== 'undefined' && data instanceof HTMLCanvasElement) ||
-            (typeof OffscreenCanvas !== 'undefined' && data instanceof OffscreenCanvas)) {
-            return { width: data.width, height: data.height };
-        }
-        if (typeof HTMLImageElement !== 'undefined' && data instanceof HTMLImageElement) {
-            return { width: data.naturalWidth, height: data.naturalHeight };
-        }
-        if (typeof HTMLVideoElement !== 'undefined' && data instanceof HTMLVideoElement) {
-            return { width: data.videoWidth, height: data.videoHeight };
-        }
-        if (typeof VideoFrame !== 'undefined' && data instanceof VideoFrame) {
-            // TODO: is this the right choice for width and height?
-            return { width: data.displayWidth, height: data.displayHeight };
-        }
-        throw new Error('Unknown image type');
-    }
-    /** Check if texture data is a typed array */
-    static isTextureLevelData(data) {
-        const typedArray = data?.data;
-        return ArrayBuffer.isView(typedArray);
-    }
-    /** Get the size of the texture described by the provided TextureData */
-    static getTextureDataSize(data) {
-        if (!data) {
-            return null;
-        }
-        if (ArrayBuffer.isView(data)) {
-            return null;
-        }
-        // Recurse into arrays (array of miplevels)
-        if (Array.isArray(data)) {
-            return Texture.getTextureDataSize(data[0]);
-        }
-        if (Texture.isExternalImage(data)) {
-            return Texture.getExternalImageSize(data);
+    /** Ensure we have integer coordinates */
+    static normalizeProps(device, props) {
+        const newProps = { ...props };
+        // Ensure we have integer coordinates
+        const { width, height } = newProps;
+        if (typeof width === 'number') {
+            newProps.width = Math.max(1, Math.ceil(width));
         }
-        if (data && typeof data === 'object' && data.constructor === Object) {
-            const textureDataArray = Object.values(data);
-            const untypedData = textureDataArray[0];
-            return { width: untypedData.width, height: untypedData.height };
+        if (typeof height === 'number') {
+            newProps.height = Math.max(1, Math.ceil(height));
         }
-        throw new Error('texture size deduction failed');
+        return newProps;
     }
-    /**
-     * Normalize TextureData to an array of TextureLevelData / ExternalImages
-     * @param data
-     * @param options
-     * @returns array of TextureLevelData / ExternalImages
-     */
-    static normalizeTextureData(data, options) {
-        let lodArray;
-        if (ArrayBuffer.isView(data)) {
-            lodArray = [
-                {
-                    // ts-expect-error does data really need to be Uint8ClampedArray?
-                    data,
-                    width: options.width,
-                    height: options.height
-                    // depth: options.depth
-                }
-            ];
-        }
-        else if (!Array.isArray(data)) {
-            lodArray = [data];
-        }
-        else {
-            lodArray = data;
+    // HELPERS
+    /** Initialize texture with supplied props */
+    // eslint-disable-next-line max-statements
+    _initializeData(data) {
+        // Store opts for accessors
+        if (this.device.isExternalImage(data)) {
+            this.copyExternalImage({
+                image: data,
+                width: this.width,
+                height: this.height,
+                depth: this.depth,
+                mipLevel: 0,
+                x: 0,
+                y: 0,
+                z: 0,
+                aspect: 'all',
+                colorSpace: 'srgb',
+                premultipliedAlpha: false,
+                flipY: false
+            });
+        }
+        else if (data) {
+            this.copyImageData({
+                data,
+                // width: this.width,
+                // height: this.height,
+                // depth: this.depth,
+                mipLevel: 0,
+                x: 0,
+                y: 0,
+                z: 0,
+                aspect: 'all'
+            });
         }
-        return lodArray;
     }
-    /** Calculate the number of mip levels for a texture of width and height */
-    static getMipLevelCount(width, height) {
-        return Math.floor(Math.log2(Math.max(width, height))) + 1;
+    _normalizeCopyImageDataOptions(options_) {
+        const { width, height, depth } = this;
+        const options = { ...Texture.defaultCopyDataOptions, width, height, depth, ...options_ };
+        const info = this.device.getTextureFormatInfo(this.format);
+        if (!options_.bytesPerRow && !info.bytesPerPixel) {
+            throw new Error(`bytesPerRow must be provided for texture format ${this.format}`);
+        }
+        options.bytesPerRow = options_.bytesPerRow || width * (info.bytesPerPixel || 4);
+        options.rowsPerImage = options_.rowsPerImage || height;
+        // WebGL will error if we try to copy outside the bounds of the texture
+        // options.width = Math.min(options.width, this.width - options.x);
+        // options.height = Math.min(options.height, this.height - options.y);
+        return options;
     }
-    /** Convert luma.gl cubemap face constants to depth index */
-    static getCubeFaceDepth(face) {
-        // prettier-ignore
-        switch (face) {
-            case '+X': return 0;
-            case '-X': return 1;
-            case '+Y': return 2;
-            case '-Y': return 3;
-            case '+Z': return 4;
-            case '-Z': return 5;
-            default: throw new Error(face);
-        }
+    _normalizeCopyExternalImageOptions(options_) {
+        const size = this.device.getExternalImageSize(options_.image);
+        const options = { ...Texture.defaultCopyExternalImageOptions, ...size, ...options_ };
+        // WebGL will error if we try to copy outside the bounds of the texture
+        options.width = Math.min(options.width, this.width - options.x);
+        options.height = Math.min(options.height, this.height - options.y);
+        return options;
     }
     /** Default options */
+    static defaultProps = {
+        ...Resource.defaultProps,
+        data: null,
+        dimension: '2d',
+        format: 'rgba8unorm',
+        usage: Texture.TEXTURE | Texture.RENDER_ATTACHMENT | Texture.COPY_DST,
+        width: undefined,
+        height: undefined,
+        depth: 1,
+        mipLevels: 1,
+        samples: undefined,
+        sampler: {},
+        view: undefined
+    };
+    static defaultCopyDataOptions = {
+        data: undefined,
+        byteOffset: 0,
+        bytesPerRow: undefined,
+        rowsPerImage: undefined,
+        mipLevel: 0,
+        x: 0,
+        y: 0,
+        z: 0,
+        aspect: 'all'
+    };
+    /** Default options */
     static defaultCopyExternalImageOptions = {
         image: undefined,
         sourceX: 0,
@@ -208,22 +209,5 @@ export class Texture extends Resource {
         premultipliedAlpha: false,
         flipY: false
     };
-    /** Ensure we have integer coordinates */
-    static normalizeProps(device, props) {
-        const newProps = { ...props };
-        // Allow device to override props (e.g. props.mipmaps)
-        const overriddenDefaultProps = device?.props?._resourceDefaults?.texture || {};
-        // TODO - Type issue with props.data circumvented with Object.assign
-        Object.assign(newProps, overriddenDefaultProps);
-        // Ensure we have integer coordinates
-        const { width, height } = newProps;
-        if (typeof width === 'number') {
-            newProps.width = Math.max(1, Math.ceil(width));
-        }
-        if (typeof height === 'number') {
-            newProps.height = Math.max(1, Math.ceil(height));
-        }
-        return newProps;
-    }
 }
 //# sourceMappingURL=texture.js.map

package/dist/adapter/resources/texture.js.map

@@ -1 +1 @@
-{"version":3,"file":"texture.js","sourceRoot":"","sources":["../../../src/adapter/resources/texture.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"texture.js","sourceRoot":"","sources":["../../../src/adapter/resources/texture.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAMpC,OAAO,EAAC,QAAQ,EAAgB,sBAAmB;AACnD,OAAO,EAAC,OAAO,EAAe,qBAAkB;AAEhD,OAAO,EAAC,GAAG,EAAC,2BAAwB;AAwDpC,MAAM,eAAe,GAAuC;IAC1D,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,UAAU,EAAE,IAAI;IAChB,IAAI,EAAE,IAAI;IACV,YAAY,EAAE,IAAI;IAClB,IAAI,EAAE,IAAI;CACX,CAAC;AA6BF;;;;GAIG;AACH,MAAM,OAAgB,OAAQ,SAAQ,QAAsB;IAC1D,wEAAwE;IACxE,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,wEAAwE;IACxE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,sFAAsF;IACtF,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,gEAAgE;IAChE,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;IACvB,6EAA6E;IAC7E,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;IAEvB,qCAAqC;IACrC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,qCAAqC;IACrC,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAEhC,gCAAgC;IACvB,SAAS,CAA0D;IAC5E,qCAAqC;IAC5B,aAAa,CAAqB;IAC3C,6BAA6B;IACpB,MAAM,CAAgB;IAC/B,sCAAsC;IACtC,KAAK,CAAS;IACd,uCAAuC;IACvC,MAAM,CAAS;IACf,4BAA4B;IAC5B,KAAK,CAAS;IACd,iCAAiC;IACjC,SAAS,CAAS;IAMlB,4FAA4F;IAC5F,eAAe,CAAS;IAExB,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAEQ,QAAQ;QACf,OAAO,WAAW,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;IAC3E,CAAC;IAED,8DAA8D;IAC9D,YAAY,MAAc,EAAE,KAAmB;QAC7C,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC9C,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QACtC,IAAI,CAAC,aAAa,GAAG,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAEhC,OAAO;QACP,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QAEtC,kCAAkC;QAClC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACtE,IAAI,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACvC,MAAM,IAAI,GAAG,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACrD,IAAI,CAAC,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC;gBAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;gBACf,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBAChB,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBACtE,GAAG,CAAC,IAAI,CACN,GAAG,IAAI,wFAAwF,CAChG,EAAE,CAAC;gBACN,CAAC;YACH,CAAC;QACH,CAAC;QAED,+DAA+D;QAC/D,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;IACrD,CAAC;IAED,qDAAqD;IACrD,UAAU,CAAC,OAA+B;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,YAAY,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC3F,CAAC;IAUD;;;;OAIG;IACH,KAAK,CAAC,IAAsC;QAC1C,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAC,GAAG,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,EAAC,CAAC,CAAC;IAC7D,CAAC;IAED,yCAAyC;IAC/B,MAAM,CAAC,cAAc,CAAC,MAAc,EAAE,KAAmB;QACjE,MAAM,QAAQ,GAAG,EAAC,GAAG,KAAK,EAAC,CAAC;QAE5B,qCAAqC;QACrC,MAAM,EAAC,KAAK,EAAE,MAAM,EAAC,GAAG,QAAQ,CAAC;QACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,UAAU;IAEV,6CAA6C;IAC7C,0CAA0C;IAC1C,eAAe,CAAC,IAA0B;QACxC,2BAA2B;QAE3B,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,iBAAiB,CAAC;gBACrB,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,CAAC;gBACX,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;gBACJ,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,MAAM;gBAClB,kBAAkB,EAAE,KAAK;gBACzB,KAAK,EAAE,KAAK;aACb,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,IAAI,EAAE,CAAC;YAChB,IAAI,CAAC,aAAa,CAAC;gBACjB,IAAI;gBACJ,qBAAqB;gBACrB,uBAAuB;gBACvB,qBAAqB;gBACrB,QAAQ,EAAE,CAAC;gBACX,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;gBACJ,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,8BAA8B,CAAC,QAA8B;QAC3D,MAAM,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC;QACpC,MAAM,OAAO,GAAG,EAAC,GAAG,OAAO,CAAC,sBAAsB,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAC,CAAC;QAEvF,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACjD,MAAM,IAAI,KAAK,CAAC,mDAAmD,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACpF,CAAC;QACD,OAAO,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,CAAC,CAAC;QAChF,OAAO,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,IAAI,MAAM,CAAC;QAEvD,uEAAuE;QACvE,mEAAmE;QACnE,sEAAsE;QACtE,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,kCAAkC,CAChC,QAAkC;QAElC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,EAAC,GAAG,OAAO,CAAC,+BAA+B,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,EAAC,CAAC;QACnF,uEAAuE;QACvE,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAChE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACnE,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,sBAAsB;IACtB,MAAM,CAAU,YAAY,GAA2B;QACrD,GAAG,QAAQ,CAAC,YAAY;QACxB,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,IAAI;QACf,MAAM,EAAE,YAAY;QACpB,KAAK,EAAE,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,QAAQ;QACrE,KAAK,EAAE,SAAU;QACjB,MAAM,EAAE,SAAU;QAClB,KAAK,EAAE,CAAC;QACR,SAAS,EAAE,CAAC;QACZ,OAAO,EAAE,SAAU;QACnB,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,SAAU;KACjB,CAAC;IAEQ,MAAM,CAAC,sBAAsB,GAAmC;QACxE,IAAI,EAAE,SAAU;QAChB,UAAU,EAAE,CAAC;QACb,WAAW,EAAE,SAAU;QACvB,YAAY,EAAE,SAAU;QACxB,QAAQ,EAAE,CAAC;QACX,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,MAAM,EAAE,KAAK;KACd,CAAC;IAEF,sBAAsB;IACZ,MAAM,CAAC,+BAA+B,GAAuC;QACrF,KAAK,EAAE,SAAU;QACjB,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,SAAU;QACjB,MAAM,EAAE,SAAU;QAClB,KAAK,EAAE,CAAC;QACR,QAAQ,EAAE,CAAC;QACX,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,MAAM,EAAE,KAAK;QACb,UAAU,EAAE,MAAM;QAClB,kBAAkB,EAAE,KAAK;QACzB,KAAK,EAAE,KAAK;KACb,CAAC"}

package/dist/adapter/resources/vertex-array.d.ts

@@ -3,11 +3,13 @@ import { AttributeInfo } from "../../adapter-utils/get-attribute-from-layouts.js
 import type { Device } from "../device.js";
 import type { Buffer } from "./buffer.js";
 import type { RenderPass } from "./render-pass.js";
-import type { RenderPipeline } from "./render-pipeline.js";
 import { Resource, ResourceProps } from "./resource.js";
+import { ShaderLayout } from "../types/shader-layout.js";
+import { BufferLayout } from "../types/buffer-layout.js";
 /** Properties for initializing a VertexArray */
 export type VertexArrayProps = ResourceProps & {
-    renderPipeline: RenderPipeline | null;
+    shaderLayout: ShaderLayout;
+    bufferLayout: BufferLayout[];
 };
 /**
  * Stores attribute bindings.

package/dist/adapter/resources/vertex-array.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vertex-array.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/vertex-array.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,UAAU,EAAC,uBAAoB;AAC5C,OAAO,EACL,aAAa,EAEd,0DAAuD;AACxD,OAAO,KAAK,EAAC,MAAM,EAAC,qBAAkB;AACtC,OAAO,KAAK,EAAC,MAAM,EAAC,oBAAiB;AACrC,OAAO,KAAK,EAAC,UAAU,EAAC,yBAAsB;AAC9C,OAAO,KAAK,EAAC,cAAc,EAAC,6BAA0B;AACtD,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,sBAAmB;AAEnD,gDAAgD;AAChD,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,cAAc,EAAE,cAAc,GAAG,IAAI,CAAC;CACvC,CAAC;AAEF;;;;;;GAMG;AACH,8BAAsB,WAAY,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IAClE,OAAgB,YAAY,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAGtD;IAEF,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;IAED,sCAAsC;IACtC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,8EAA8E;IAC9E,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;IAEnD,mBAAmB;IACnB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClC,wCAAwC;IACxC,UAAU,EAAE,CAAC,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC;gBAE/B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB;IAenD,mEAAmE;IACnE,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IACrD,mEAAmE;IACnE,QAAQ,CAAC,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAEnE,QAAQ,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IACvD,QAAQ,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAIxD,uDAAuD;IACvD,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,GAAG,IAAI;CAGnE"}
+{"version":3,"file":"vertex-array.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/vertex-array.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,UAAU,EAAC,uBAAoB;AAC5C,OAAO,EACL,aAAa,EAEd,0DAAuD;AACxD,OAAO,KAAK,EAAC,MAAM,EAAC,qBAAkB;AACtC,OAAO,KAAK,EAAC,MAAM,EAAC,oBAAiB;AACrC,OAAO,KAAK,EAAC,UAAU,EAAC,yBAAsB;AAC9C,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,sBAAmB;AACnD,OAAO,EAAC,YAAY,EAAC,kCAA+B;AACpD,OAAO,EAAC,YAAY,EAAC,kCAA+B;AAEpD,gDAAgD;AAChD,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,EAAE,CAAC;CAC9B,CAAC;AAEF;;;;;;GAMG;AACH,8BAAsB,WAAY,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IAClE,OAAgB,YAAY,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAItD;IAEF,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;IAED,sCAAsC;IACtC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,8EAA8E;IAC9E,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;IAEnD,mBAAmB;IACnB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClC,wCAAwC;IACxC,UAAU,EAAE,CAAC,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC;gBAE/B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB;IAWnD,mEAAmE;IACnE,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IACrD,mEAAmE;IACnE,QAAQ,CAAC,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAEnE,QAAQ,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IACvD,QAAQ,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAIxD,uDAAuD;IACvD,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,GAAG,IAAI;CAGnE"}

package/dist/adapter/resources/vertex-array.js

@@ -13,7 +13,8 @@ import { Resource } from "./resource.js";
 export class VertexArray extends Resource {
     static defaultProps = {
         ...Resource.defaultProps,
-        renderPipeline: null
+        shaderLayout: undefined,
+        bufferLayout: []
     };
     get [Symbol.toStringTag]() {
         return 'VertexArray';
@@ -30,16 +31,12 @@ export class VertexArray extends Resource {
         super(device, props, VertexArray.defaultProps);
         this.maxVertexAttributes = device.limits.maxVertexAttributes;
         this.attributes = new Array(this.maxVertexAttributes).fill(null);
-        const { shaderLayout, bufferLayout } = props.renderPipeline || {};
-        if (!shaderLayout || !bufferLayout) {
-            throw new Error('VertexArray');
-        }
-        this.attributeInfos = getAttributeInfosByLocation(shaderLayout, bufferLayout, this.maxVertexAttributes);
+        this.attributeInfos = getAttributeInfosByLocation(props.shaderLayout, props.bufferLayout, this.maxVertexAttributes);
     }
     // DEPRECATED METHODS
     /** @deprecated Set constant attributes (WebGL only) */
     setConstantWebGL(location, value) {
-        this.device.reportError(new Error('constant attributes not supported'));
+        this.device.reportError(new Error('constant attributes not supported'), this)();
     }
 }
 //# sourceMappingURL=vertex-array.js.map

package/dist/adapter/resources/vertex-array.js.map

@@ -1 +1 @@
-{"version":3,"file":"vertex-array.js","sourceRoot":"","sources":["../../../src/adapter/resources/vertex-array.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAEL,2BAA2B,EAC5B,0DAAuD;AAKxD,OAAO,EAAC,QAAQ,EAAgB,sBAAmB;AAOnD;;;;;;GAMG;AACH,MAAM,OAAgB,WAAY,SAAQ,QAA0B;IAClE,MAAM,CAAU,YAAY,GAA+B;QACzD,GAAG,QAAQ,CAAC,YAAY;QACxB,cAAc,EAAE,IAAI;KACrB,CAAC;IAEF,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC;QAC/B,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,sCAAsC;IAC7B,mBAAmB,CAAS;IACrC,8EAA8E;IAC3D,cAAc,CAAkB;IAEnD,mBAAmB;IACnB,WAAW,GAAkB,IAAI,CAAC;IAClC,wCAAwC;IACxC,UAAU,CAAiC;IAE3C,YAAY,MAAc,EAAE,KAAuB;QACjD,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;QAC/C,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC;QAC7D,IAAI,CAAC,UAAU,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,MAAM,EAAC,YAAY,EAAE,YAAY,EAAC,GAAG,KAAK,CAAC,cAAc,IAAI,EAAE,CAAC;QAChE,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,cAAc,GAAG,2BAA2B,CAC/C,YAAY,EACZ,YAAY,EACZ,IAAI,CAAC,mBAAmB,CACzB,CAAC;IACJ,CAAC;IAUD,qBAAqB;IAErB,uDAAuD;IACvD,gBAAgB,CAAC,QAAgB,EAAE,KAAwB;QACzD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC,CAAC;IAC1E,CAAC"}
+{"version":3,"file":"vertex-array.js","sourceRoot":"","sources":["../../../src/adapter/resources/vertex-array.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAEL,2BAA2B,EAC5B,0DAAuD;AAIxD,OAAO,EAAC,QAAQ,EAAgB,sBAAmB;AAUnD;;;;;;GAMG;AACH,MAAM,OAAgB,WAAY,SAAQ,QAA0B;IAClE,MAAM,CAAU,YAAY,GAA+B;QACzD,GAAG,QAAQ,CAAC,YAAY;QACxB,YAAY,EAAE,SAAU;QACxB,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC;QAC/B,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,sCAAsC;IAC7B,mBAAmB,CAAS;IACrC,8EAA8E;IAC3D,cAAc,CAAkB;IAEnD,mBAAmB;IACnB,WAAW,GAAkB,IAAI,CAAC;IAClC,wCAAwC;IACxC,UAAU,CAAiC;IAE3C,YAAY,MAAc,EAAE,KAAuB;QACjD,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;QAC/C,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC;QAC7D,IAAI,CAAC,UAAU,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,cAAc,GAAG,2BAA2B,CAC/C,KAAK,CAAC,YAAY,EAClB,KAAK,CAAC,YAAY,EAClB,IAAI,CAAC,mBAAmB,CACzB,CAAC;IACJ,CAAC;IAUD,qBAAqB;IAErB,uDAAuD;IACvD,gBAAgB,CAAC,QAAgB,EAAE,KAAwB;QACzD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,mCAAmC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;IAClF,CAAC"}

package/dist/adapter/types/attachments.d.ts

@@ -1,4 +1,4 @@
-import type { ColorTextureFormat, DepthStencilTextureFormat, TextureFormat } from "../../gpu-type-utils/texture-formats.js";
+import type { TextureFormatColor, TextureFormatDepthStencil, TextureFormat } from "../../shadertypes/textures/texture-formats.js";
 import type { Texture } from "../resources/texture.js";
 import type { TextureView } from "../resources/texture-view.js";
 /** Describes a buffer binding layout */
@@ -38,7 +38,7 @@ export type ColorAttachment = {
     /** Describes the texture subresource that will be output to for this color attachment. */
     texture?: TextureView | Texture;
     /** Format of the texture resource. Used to auto create texture if not supplied */
-    format?: ColorTextureFormat;
+    format?: TextureFormatColor;
     /** Value to clear to prior to executing the render pass. Default: [0, 0, 0, 0]. Ignored if loadOp is not "clear". */
     clearValue?: number[];
     /** load operation to perform on texture prior to executing the render pass. Default: 'clear'. */
@@ -54,7 +54,7 @@ export type DepthStencilAttachment = {
     /** Describes the texture subresource that will be output to and read from for this depth/stencil attachment. */
     texture?: TextureView | Texture;
     /** Format of the texture resource. Used to auto create texture if not supplied */
-    format?: DepthStencilTextureFormat;
+    format?: TextureFormatDepthStencil;
     /** Value to clear depth component to prior to executing the render pass, if depthLoadOp is "clear". 0.0-1.0. */
     depthClearValue?: number;
     /** Indicates load operation to perform on depth component prior to executing the render pass. Default 'clear'. */

package/dist/adapter/types/attachments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachments.d.ts","sourceRoot":"","sources":["../../../src/adapter/types/attachments.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,kBAAkB,EAClB,yBAAyB,EACzB,aAAa,EACd,gDAA6C;AAC9C,OAAO,KAAK,EAAC,OAAO,EAAC,gCAA6B;AAClD,OAAO,KAAK,EAAC,WAAW,EAAC,qCAAkC;AAM3D,wCAAwC;AACxC,KAAK,mBAAmB,GAAG;IACzB,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,qBAAqB;IACrB,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,mBAAmB,CAAC;IAClD,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,kCAAkC;AAClC,KAAK,oBAAoB,GAAG;IAC1B,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,IAAI,CAAC;IACxE,UAAU,CAAC,EAAE,OAAO,GAAG,oBAAoB,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACxE,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,0CAA0C;AAC1C,KAAK,2BAA2B,GAAG;IACjC,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,aAAa,CAAC;IACtB,aAAa,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,IAAI,CAAC;CACzE,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAC1B,mBAAmB,GACnB,oBAAoB,GACpB,2BAA2B,CAAC;AAIhC;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,0FAA0F;IAC1F,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;IAChC,kFAAkF;IAClF,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAI5B,qHAAqH;IACrH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,iGAAiG;IACjG,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,mGAAmG;IACnG,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,gHAAgH;IAChH,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;IAChC,kFAAkF;IAClF,MAAM,CAAC,EAAE,yBAAyB,CAAC;IAEnC,gHAAgH;IAChH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kHAAkH;IAClH,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/B,uGAAuG;IACvG,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACnC,uDAAuD;IACvD,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,qHAAqH;IACrH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qHAAqH;IACrH,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,uFAAuF;IACvF,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,yDAAyD;IACzD,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC"}
+{"version":3,"file":"attachments.d.ts","sourceRoot":"","sources":["../../../src/adapter/types/attachments.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,kBAAkB,EAClB,yBAAyB,EACzB,aAAa,EACd,sDAAmD;AACpD,OAAO,KAAK,EAAC,OAAO,EAAC,gCAA6B;AAClD,OAAO,KAAK,EAAC,WAAW,EAAC,qCAAkC;AAM3D,wCAAwC;AACxC,KAAK,mBAAmB,GAAG;IACzB,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,qBAAqB;IACrB,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,mBAAmB,CAAC;IAClD,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,kCAAkC;AAClC,KAAK,oBAAoB,GAAG;IAC1B,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,IAAI,CAAC;IACxE,UAAU,CAAC,EAAE,OAAO,GAAG,oBAAoB,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACxE,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,0CAA0C;AAC1C,KAAK,2BAA2B,GAAG;IACjC,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,aAAa,CAAC;IACtB,aAAa,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,IAAI,CAAC;CACzE,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAC1B,mBAAmB,GACnB,oBAAoB,GACpB,2BAA2B,CAAC;AAIhC;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,0FAA0F;IAC1F,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;IAChC,kFAAkF;IAClF,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAI5B,qHAAqH;IACrH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,iGAAiG;IACjG,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,mGAAmG;IACnG,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,gHAAgH;IAChH,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;IAChC,kFAAkF;IAClF,MAAM,CAAC,EAAE,yBAAyB,CAAC;IAEnC,gHAAgH;IAChH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kHAAkH;IAClH,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/B,uGAAuG;IACvG,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACnC,uDAAuD;IACvD,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,qHAAqH;IACrH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qHAAqH;IACrH,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,uFAAuF;IACvF,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,yDAAyD;IACzD,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC"}

package/dist/adapter/types/buffer-layout.d.ts

@@ -1,4 +1,4 @@
-import type { VertexFormat } from "../../gpu-type-utils/vertex-formats.js";
+import type { VertexFormat } from "../../shadertypes/vertex-arrays/vertex-formats.js";
 /**
  * Provides specific details about the memory layout of the actual buffers
  * that will be provided to a `RenderPipeline`.

package/dist/adapter/types/buffer-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buffer-layout.d.ts","sourceRoot":"","sources":["../../../src/adapter/types/buffer-layout.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,+CAA4C;AAEtE;;;;;;;;;;;GAWG;AAEH;;;;;;;;;;;;;;;;;;;;;;;IAuBI;AACJ,MAAM,MAAM,YAAY,GAAG;IACzB,qBAAqB;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IACjC,gGAAgG;IAChG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kEAAkE;IAClE,UAAU,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACrC,2DAA2D;IAC3D,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB,CAAC;AAEF,+EAA+E;AAC/E,MAAM,MAAM,qBAAqB,GAAG;IAClC,6DAA6D;IAC7D,SAAS,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,MAAM,EAAE,YAAY,CAAC;IACrB,+FAA+F;IAC/F,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}
+{"version":3,"file":"buffer-layout.d.ts","sourceRoot":"","sources":["../../../src/adapter/types/buffer-layout.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,0DAAuD;AAEjF;;;;;;;;;;;GAWG;AAEH;;;;;;;;;;;;;;;;;;;;;;;IAuBI;AACJ,MAAM,MAAM,YAAY,GAAG;IACzB,qBAAqB;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IACjC,gGAAgG;IAChG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kEAAkE;IAClE,UAAU,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACrC,2DAA2D;IAC3D,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB,CAAC;AAEF,+EAA+E;AAC/E,MAAM,MAAM,qBAAqB,GAAG;IAClC,6DAA6D;IAC7D,SAAS,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,MAAM,EAAE,YAAY,CAAC;IACrB,+FAA+F;IAC/F,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}

package/dist/adapter/types/parameters.d.ts

@@ -1,5 +1,5 @@
 import { NumberArray4, NumberArray6 } from '@math.gl/types';
-import { DepthStencilTextureFormat } from "../../gpu-type-utils/texture-formats.js";
+import { TextureFormatDepthStencil } from "../../shadertypes/textures/texture-formats.js";
 export type CompareFunction = 'never' | 'less' | 'equal' | 'less-equal' | 'greater' | 'not-equal' | 'greater-equal' | 'always';
 export type PrimitiveTopology = 'point-list' | 'line-list' | 'line-strip' | 'triangle-list' | 'triangle-strip';
 export type IndexFormat = 'uint16' | 'uint32';
@@ -57,7 +57,7 @@ export type DepthStencilParameters = {
     /** The comparison operation used to test fragment depths against existing depthStencilAttachment depth values. */
     depthCompare?: CompareFunction;
     /** The format of depthStencilAttachment this GPURenderPipeline will be compatible with. */
-    depthFormat?: DepthStencilTextureFormat;
+    depthFormat?: TextureFormatDepthStencil;
     /** Bitmask controlling which depthStencilAttachment stencil value bits are read when performing stencil comparison tests. */
     stencilReadMask?: number;
     /** Bitmask controlling which depthStencilAttachment stencil value bits are written to when performing stencil operations. */
@@ -72,9 +72,13 @@ export type DepthStencilParameters = {
     stencilDepthFailOperation?: StencilOperation;
 };
 /** BlendFactor defines how either a source or destination blend factors is calculated */
-export type BlendFactor = 'zero' | 'one' | 'src-color' | 'one-minus-src-color' | 'src-alpha' | 'one-minus-src-alpha' | 'dst-color' | 'one-minus-dst-color' | 'dst-alpha' | 'one-minus-dst-alpha' | 'src-alpha-saturated' | 'constant-color' | 'one-minus-constant-color' | 'constant-alpha' | 'one-minus-constant-alpha';
+export type BlendFactor = 'zero' | 'one' | 'src' | 'one-minus-src' | 'src-alpha' | 'one-minus-src-alpha' | 'dst' | 'one-minus-dst' | 'dst-alpha' | 'one-minus-dst-alpha' | 'src-alpha-saturated' | 'constant' | 'one-minus-constant' | 'src1' | 'one-minus-src1' | 'src1-alpha' | 'one-minus-src1-alpha';
 /** BlendOperation defines the algorithm used to combine source and destination blend factors: */
 export type BlendOperation = 'add' | 'subtract' | 'reverse-subtract' | 'min' | 'max';
+/**
+ * Color parameters are set on the RenderPipeline
+ * @todo - this needs to be settable on a per-attachment basis, not just for first attachment
+ */
 export type ColorParameters = {
     /** Enable blending */
     blend?: boolean;

package/dist/adapter/types/parameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parameters.d.ts","sourceRoot":"","sources":["../../../src/adapter/types/parameters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parameters.d.ts","sourceRoot":"","sources":["../../../src/adapter/types/parameters.ts"],"names":[],"mappings":"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"}

package/dist/adapter/types/parameters.js.map

@@ -1 +1 @@
-{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../src/adapter/types/parameters.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAuMpC,+CAA+C;AAE/C,MAAM,CAAC,MAAM,kBAAkB,GAAyB;IACtD,2BAA2B;IAE3B,QAAQ,EAAE,MAAM;IAChB,SAAS,EAAE,KAAK;IAEhB,mBAAmB;IAEnB,iBAAiB,EAAE,KAAK;IACxB,YAAY,EAAE,QAAQ;IACtB,WAAW,EAAE,aAAa;IAE1B,SAAS,EAAE,CAAC;IACZ,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,CAAC;IAEjB,qBAAqB;IAErB,eAAe,EAAE,UAAU;IAC3B,gBAAgB,EAAE,UAAU;IAE5B,cAAc,EAAE,QAAQ;IACxB,oBAAoB,EAAE,MAAM;IAC5B,oBAAoB,EAAE,MAAM;IAC5B,yBAAyB,EAAE,MAAM;IAEjC,yBAAyB;IACzB,WAAW,EAAE,CAAC;IACd,UAAU,EAAE,UAAU;IACtB,4BAA4B,EAAE,KAAK;IAEnC,6BAA6B;IAC7B,KAAK,EAAE,KAAK;IAEZ,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,MAAM;IAE3B,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,MAAM;IAE3B,SAAS,EAAE,GAAG;IAEd,aAAa;IAEb,cAAc,EAAE,KAAK;IACrB,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,MAAM;IACnB,iBAAiB,EAAE,KAAK;IAExB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;CAC1B,CAAC"}
+{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../src/adapter/types/parameters.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AA4MpC,+CAA+C;AAE/C,MAAM,CAAC,MAAM,kBAAkB,GAAyB;IACtD,2BAA2B;IAE3B,QAAQ,EAAE,MAAM;IAChB,SAAS,EAAE,KAAK;IAEhB,mBAAmB;IAEnB,iBAAiB,EAAE,KAAK;IACxB,YAAY,EAAE,QAAQ;IACtB,WAAW,EAAE,aAAa;IAE1B,SAAS,EAAE,CAAC;IACZ,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,CAAC;IAEjB,qBAAqB;IAErB,eAAe,EAAE,UAAU;IAC3B,gBAAgB,EAAE,UAAU;IAE5B,cAAc,EAAE,QAAQ;IACxB,oBAAoB,EAAE,MAAM;IAC5B,oBAAoB,EAAE,MAAM;IAC5B,yBAAyB,EAAE,MAAM;IAEjC,yBAAyB;IACzB,WAAW,EAAE,CAAC;IACd,UAAU,EAAE,UAAU;IACtB,4BAA4B,EAAE,KAAK;IAEnC,6BAA6B;IAC7B,KAAK,EAAE,KAAK;IAEZ,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,MAAM;IAE3B,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,MAAM;IAE3B,SAAS,EAAE,GAAG;IAEd,aAAa;IAEb,cAAc,EAAE,KAAK;IACrB,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,MAAM;IACnB,iBAAiB,EAAE,KAAK;IAExB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;IACzB,aAAa,EAAE,SAAU;CAC1B,CAAC"}

package/dist/adapter/types/shader-layout.d.ts

@@ -1,5 +1,5 @@
-import type { TextureFormat } from "../../gpu-type-utils/texture-formats.js";
-import type { ShaderUniformType, ShaderAttributeType } from "../../gpu-type-utils/shader-types.js";
+import type { TextureFormat } from "../../shadertypes/textures/texture-formats.js";
+import type { VariableShaderType, AttributeShaderType } from "../../shadertypes/data-types/shader-types.js";
 import type { Buffer } from "../resources/buffer.js";
 import type { Sampler } from "../resources/sampler.js";
 import type { Texture } from "../resources/texture.js";
@@ -49,7 +49,7 @@ export type AttributeDeclaration = {
     /** The index into the GPU's vertex array buffer bank (usually between 0-15) */
     location: number;
     /** WebGPU-style shader type. The declared format of the attribute in the shader code. Buffer's vertex format needs to map to this. */
-    type: ShaderAttributeType;
+    type: AttributeShaderType;
     /** Inferred from attribute name. @note Technically not part of static structure of shader */
     stepMode?: 'vertex' | 'instance';
 };
@@ -72,7 +72,7 @@ export type UniformBufferBindingLayout = {
 };
 export type UniformInfo = {
     name: string;
-    format: ShaderUniformType;
+    format: VariableShaderType;
     type?: string;
     arrayLength: number;
     byteOffset: number;
@@ -144,7 +144,7 @@ export type Binding = TextureView | Texture | Sampler | Buffer | {
 export type VaryingBinding = {
     location: number;
     name: string;
-    type: number;
+    type: AttributeShaderType;
     size: number;
 };
 /** Describes a uniform block binding for a program */