@luma.gl/core 9.0.17 → 9.1.0-alpha.10

package/dist/adapter/resources/framebuffer.js

@@ -23,16 +23,10 @@ export class Framebuffer extends Resource {
     width;
     /** Height of all attachments in this framebuffer */
     height;
-    /** Color attachments */
-    colorAttachments = [];
-    /** Depth-stencil attachment, if provided */
-    depthStencilAttachment = null;
     constructor(device, props = {}) {
         super(device, props, Framebuffer.defaultProps);
         this.width = this.props.width;
         this.height = this.props.height;
-        // NOTE: call from subclass constructor as we cannot call overridden methods here (subclass not yet constructed)
-        // this.autoCreateAttachmentTextures();
     }
     resize(size) {
         let updateSize = !size;
@@ -107,7 +101,7 @@ export class Framebuffer extends Resource {
         for (let i = 0; i < this.colorAttachments.length; ++i) {
             if (this.colorAttachments[i]) {
                 const resizedTexture = this.device._createTexture({
-                    ...this.colorAttachments[i].props,
+                    ...this.colorAttachments[i].texture.props,
                     width,
                     height
                 });
@@ -118,7 +112,7 @@ export class Framebuffer extends Resource {
         }
         if (this.depthStencilAttachment) {
             const resizedTexture = this.device._createTexture({
-                ...this.depthStencilAttachment.props,
+                ...this.depthStencilAttachment.texture.props,
                 width,
                 height
             });
@@ -128,78 +122,3 @@ export class Framebuffer extends Resource {
         }
     }
 }
-// TODO - remove if not needed
-// Create a color attachment for WebGL *
-// protected override createColorTexture(colorAttachment: Required<ColorAttachment>): Required<ColorAttachment> {
-//   return this.device._createTexture({
-//     id: `${this.id}-color`,
-//     data: null, // reserves texture memory, but texels are undefined
-//     format,
-//     // type: GL.UNSIGNED_BYTE,
-//     width: this.width,
-//     height: this.height,
-//     // Note: Mipmapping can be disabled by texture resource when we resize the texture
-//     // to a non-power-of-two dimenstion (NPOT texture) under WebGL1. To have consistant
-//     // behavior we always disable mipmaps.
-//     mipmaps: false,
-//     // Set MIN and MAG filtering parameters so mipmaps are not used in sampling.
-//     // Use LINEAR so subpixel algos like fxaa work.
-//     // Set WRAP modes that support NPOT textures too.
-//     sampler: {
-//       minFilter: 'linear',
-//       magFilter: 'linear',
-//       addressModeU: 'clamp-to-edge',
-//       addressModeV: 'clamp-to-edge'
-//     }
-//     // parameters: {
-//     //   [GL.TEXTURE_MIN_FILTER]: GL.LINEAR,
-//     //   [GL.TEXTURE_MAG_FILTER]: GL.LINEAR,
-//     //   [GL.TEXTURE_WRAP_S]: GL.CLAMP_TO_EDGE,
-//     //   [GL.TEXTURE_WRAP_T]: GL.CLAMP_TO_EDGE
-//     // }
-//   });
-// }
-// /** Returns fully populated attachment object. */
-// protected normalizeColorAttachment(
-//   attachment: Texture | ColorTextureFormat
-// ): Required<ColorAttachment> {
-//   const COLOR_ATTACHMENT_DEFAULTS: Required<ColorAttachment> = {
-//     texture: undefined!,
-//     format: undefined!,
-//     clearValue: [0.0, 0.0, 0.0, 0.0],
-//     loadOp: 'clear',
-//     storeOp: 'store'
-//   };
-//   if (attachment instanceof Texture) {
-//     return {...COLOR_ATTACHMENT_DEFAULTS, texture: attachment};
-//   }
-//   if (typeof attachment === 'string') {
-//     return {...COLOR_ATTACHMENT_DEFAULTS, format: attachment};
-//   }
-//   return {...COLOR_ATTACHMENT_DEFAULTS, ...attachment};
-// }
-// /** Wraps texture inside fully populated attachment object. */
-// protected normalizeDepthStencilAttachment(
-//   attachment: DepthStencilAttachment | Texture | DepthStencilTextureFormat
-// ): Required<DepthStencilAttachment> {
-//   const DEPTH_STENCIL_ATTACHMENT_DEFAULTS: Required<DepthStencilAttachment> = {
-//     texture: undefined!,
-//     format: undefined!,
-//     depthClearValue: 1.0,
-//     depthLoadOp: 'clear',
-//     depthStoreOp: 'store',
-//     depthReadOnly: false,
-//     stencilClearValue: 0,
-//     stencilLoadOp: 'clear',
-//     stencilStoreOp: 'store',
-//     stencilReadOnly: false
-//   };
-//   if (typeof attachment === 'string') {
-//     return {...DEPTH_STENCIL_ATTACHMENT_DEFAULTS, format: attachment};
-//   }
-//   // @ts-expect-error attachment instanceof Texture doesn't cover Renderbuffer
-//   if (attachment.handle || attachment instanceof Texture) {
-//     return {...DEPTH_STENCIL_ATTACHMENT_DEFAULTS, texture: attachment as Texture};
-//   }
-//   return {...DEPTH_STENCIL_ATTACHMENT_DEFAULTS, ...attachment};
-// }

package/dist/adapter/resources/render-pass.d.ts

@@ -14,6 +14,8 @@ export type RenderPassProps = ResourceProps & {
     parameters?: RenderPassParameters;
     /** Clear value for color attachment, or `load` to preserve the previous value */
     clearColor?: NumberArray | false;
+    /** Whether to disable / discard the output of the rasterizer */
+    discard?: boolean;
     /** Clear value for depth attachment, or `load` to preserve the previous value */
     clearDepth?: number | false;
     /** Clear value for stencil attachment, or `load` to preserve the previous value */
@@ -22,8 +24,6 @@ export type RenderPassProps = ResourceProps & {
     depthReadOnly?: boolean;
     /** Indicates that the stencil component is read only. */
     stencilReadOnly?: boolean;
-    /** Whether to disable / discard the output of the rasterizer */
-    discard?: boolean;
     /** QuerySet to write begin/end timestamps to */
     occlusionQuerySet?: QuerySet;
     /** QuerySet to write begin/end timestamps to */

package/dist/adapter/resources/render-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/render-pass.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,qBAAkB;AACtC,OAAO,KAAK,EAAC,oBAAoB,EAAC,+BAA4B;AAE9D,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,sBAAmB;AACnD,OAAO,EAAC,WAAW,EAAC,yBAAsB;AAC1C,OAAO,EAAC,WAAW,EAAC,uBAAoB;AACxC,OAAO,EAAC,QAAQ,EAAC,uBAAoB;AAErC;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG;IAC5C,yGAAyG;IACzG,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,qEAAqE;IACrE,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAClC,iFAAiF;IACjF,UAAU,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC;IACjC,iFAAiF;IACjF,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAC5B,mFAAmF;IACnF,YAAY,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAC9B,uDAAuD;IACvD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,yDAAyD;IACzD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gEAAgE;IAChE,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,gDAAgD;IAChD,iBAAiB,CAAC,EAAE,QAAQ,CAAC;IAC7B,gDAAgD;IAChD,iBAAiB,CAAC,EAAE,QAAQ,CAAC;IAC7B,2FAA2F;IAC3F,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,yFAAyF;IACzF,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF;;;;;;;GAOG;AACH,8BAAsB,UAAW,SAAQ,QAAQ,CAAC,eAAe,CAAC;IAChE,wCAAwC;IACxC,OAAgB,YAAY,EAAE,QAAQ,CAAC,eAAe,CAAC,CAerD;IAEF,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;gBAEW,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe;IAIlD,gDAAgD;IAChD,QAAQ,CAAC,GAAG,IAAI,IAAI;IAEpB,wGAAwG;IACxG,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI;IAI9D,gIAAgI;IAChI,QAAQ,CAAC,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACtD,2FAA2F;IAC3F,QAAQ,CAAC,iBAAiB,IAAI,IAAI;IAElC,kEAAkE;IAClE,QAAQ,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACjD,6EAA6E;IAC7E,QAAQ,CAAC,aAAa,IAAI,IAAI;IAC9B,yDAAyD;IACzD,QAAQ,CAAC,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;CActD"}
+{"version":3,"file":"render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/render-pass.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,qBAAkB;AACtC,OAAO,KAAK,EAAC,oBAAoB,EAAC,+BAA4B;AAE9D,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,sBAAmB;AACnD,OAAO,EAAC,WAAW,EAAC,yBAAsB;AAC1C,OAAO,EAAC,WAAW,EAAC,uBAAoB;AACxC,OAAO,EAAC,QAAQ,EAAC,uBAAoB;AAErC;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG;IAC5C,yGAAyG;IACzG,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,qEAAqE;IACrE,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAIlC,iFAAiF;IACjF,UAAU,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC;IACjC,gEAAgE;IAChE,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,iFAAiF;IACjF,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAC5B,mFAAmF;IACnF,YAAY,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAC9B,uDAAuD;IACvD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,yDAAyD;IACzD,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,gDAAgD;IAChD,iBAAiB,CAAC,EAAE,QAAQ,CAAC;IAC7B,gDAAgD;IAChD,iBAAiB,CAAC,EAAE,QAAQ,CAAC;IAC7B,2FAA2F;IAC3F,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,yFAAyF;IACzF,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF;;;;;;;GAOG;AACH,8BAAsB,UAAW,SAAQ,QAAQ,CAAC,eAAe,CAAC;IAChE,wCAAwC;IACxC,OAAgB,YAAY,EAAE,QAAQ,CAAC,eAAe,CAAC,CAerD;IAEF,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;gBAEW,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe;IAIlD,gDAAgD;IAChD,QAAQ,CAAC,GAAG,IAAI,IAAI;IAEpB,wGAAwG;IACxG,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI;IAI9D,gIAAgI;IAChI,QAAQ,CAAC,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACtD,2FAA2F;IAC3F,QAAQ,CAAC,iBAAiB,IAAI,IAAI;IAElC,kEAAkE;IAClE,QAAQ,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACjD,6EAA6E;IAC7E,QAAQ,CAAC,aAAa,IAAI,IAAI;IAC9B,yDAAyD;IACzD,QAAQ,CAAC,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;CActD"}

package/dist/adapter/resources/render-pipeline.d.ts

@@ -1,5 +1,5 @@
 import type { Device } from "../device.js";
-import type { UniformValue } from "../types/types.js";
+import type { UniformValue } from "../types/uniforms.js";
 import type { PrimitiveTopology, RenderPipelineParameters } from "../types/parameters.js";
 import type { ShaderLayout, Binding } from "../types/shader-layout.js";
 import type { BufferLayout } from "../types/buffer-layout.js";
@@ -23,10 +23,7 @@ export type RenderPipelineProps = ResourceProps & {
     fsConstants?: Record<string, number>;
     /** Describes the attributes and bindings exposed by the pipeline shader(s). */
     shaderLayout?: ShaderLayout | null;
-    /**
-     * Describes the buffers accepted by this pipeline and how they are mapped to shader attributes.
-     * A default mapping of one buffer per attribute is always created.
-     */
+    /** Describes the buffers accepted by this pipeline and how they are mapped to shader attributes. */
     bufferLayout?: BufferLayout[];
     /** Determines how vertices are read from the 'vertex' attributes */
     topology?: PrimitiveTopology;

package/dist/adapter/resources/render-pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/render-pipeline.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/render-pipeline.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,qBAAkB;AACtC,OAAO,KAAK,EAAC,YAAY,EAAC,6BAA0B;AACpD,OAAO,KAAK,EAAC,iBAAiB,EAAE,wBAAwB,EAAC,+BAA4B;AACrF,OAAO,KAAK,EAAC,YAAY,EAAE,OAAO,EAAC,kCAA+B;AAClE,OAAO,KAAK,EAAC,YAAY,EAAC,kCAA+B;AAEzD,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,sBAAmB;AACnD,OAAO,KAAK,EAAC,MAAM,EAAC,oBAAiB;AACrC,OAAO,KAAK,EAAC,UAAU,EAAC,yBAAsB;AAC9C,OAAO,EAAC,WAAW,EAAC,0BAAuB;AAC3C,OAAO,EAAC,iBAAiB,EAAC,gCAA6B;AAEvD,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAGhD,6BAA6B;IAC7B,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,qGAAqG;IACrG,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,+BAA+B;IAC/B,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,kFAAkF;IAClF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uGAAuG;IACvG,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAErC,+EAA+E;IAC/E,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACnC,oGAAoG;IACpG,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAE9B,oEAAoE;IACpE,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IAC7B,iDAAiD;IACjD,UAAU,CAAC,EAAE,wBAAwB,CAAC;IAStC,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,8BAAsB,cAAe,SAAQ,QAAQ,CAAC,mBAAmB,CAAC;IACxE,OAAgB,YAAY,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAsBzD;IAEF,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;IAED,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpC,wBAAwB;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,oDAAoD;IACpD,QAAQ,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC;IACtC,kGAAkG;IAClG,UAAU,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAAa;IACxD,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAM;gBAEN,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAMtD,iEAAiE;IACjE,QAAQ,CAAC,WAAW,CAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,OAAO,CAAC,EAAE;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAC,GACpC,IAAI;IAEP,kGAAkG;IAClG,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE;QACrB,iEAAiE;QACjE,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,wGAAwG;QACxG,UAAU,CAAC,EAAE,wBAAwB,CAAC;QACtC,sDAAsD;QACtD,QAAQ,CAAC,EAAE,iBAAiB,CAAC;QAC7B,wBAAwB;QACxB,WAAW,EAAE,WAAW,CAAC;QACzB,+BAA+B;QAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,6CAA6C;QAC7C,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,2CAA2C;QAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,uCAAuC;QACvC,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,gCAAgC;QAChC,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,+BAA+B;QAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,kCAAkC;QAClC,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,sCAAsC;QACtC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;KACvC,GAAG,OAAO;IAIX;;;;;OAKG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,IAAI;CAG/D"}

package/dist/adapter/resources/resource.d.ts

@@ -48,15 +48,15 @@ export declare abstract class Resource<Props extends ResourceProps> {
      * Attaches a resource. Attached resources are auto destroyed when this resource is destroyed
      * Called automatically when sub resources are auto created but can be called by application
      */
-    attachResource(resource: Resource<unknown>): void;
+    attachResource(resource: Resource<ResourceProps>): void;
     /**
      * Detach an attached resource. The resource will no longer be auto-destroyed when this resource is destroyed.
      */
-    detachResource(resource: Resource<unknown>): void;
+    detachResource(resource: Resource<ResourceProps>): void;
     /**
      * Destroys a resource (only if owned), and removes from the owned (auto-destroy) list for this resource.
      */
-    destroyAttachedResource(resource: Resource<unknown>): void;
+    destroyAttachedResource(resource: Resource<ResourceProps>): void;
     /** Destroy all owned resources. Make sure the resources are no longer needed before calling. */
     destroyAttachedResources(): void;
     /** Perform all destroy steps. Can be called by derived resources when overriding destroy() */

package/dist/adapter/resources/resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/resource.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,qBAAkB;AAGtC,MAAM,MAAM,aAAa,GAAG;IAC1B,sGAAsG;IACtG,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,0EAA0E;IAC1E,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,kDAAkD;IAClD,QAAQ,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;CACjC,CAAC;AAEF;;GAEG;AACH,8BAAsB,QAAQ,CAAC,KAAK,SAAS,aAAa;IACxD,sCAAsC;IACtC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,CAI1C;IAEF,QAAQ,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC;IAE5C,+BAA+B;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IAChD,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACjC,OAAO,CAAC,OAAO,CAAS;IAExB,+CAA+C;IAC/C,SAAS,EAAE,OAAO,CAAS;IAC3B,6CAA6C;IAC7C,OAAO,CAAC,cAAc,CAAa;IACnC,iHAAiH;IACjH,OAAO,CAAC,kBAAkB,CAAgC;IAE1D;;OAEG;gBACS,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC;IAgBvE;;OAEG;IACH,OAAO,IAAI,IAAI;IAIf,gCAAgC;IAChC,MAAM,IAAI,IAAI;IAKd,QAAQ,IAAI,MAAM;IAIlB;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAMlB;;;OAGG;IACH,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI;IAIjD;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI;IAIjD;;OAEG;IACH,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI;IAM1D,gGAAgG;IAChG,wBAAwB,IAAI,IAAI;IAUhC,8FAA8F;IAC9F,SAAS,CAAC,eAAe,IAAI,IAAI;IAMjC,mGAAmG;IACnG,SAAS,CAAC,WAAW,IAAI,IAAI;IAM7B,qDAAqD;IACrD,SAAS,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,SAA2B,GAAG,IAAI;IAOpF,uDAAuD;IACvD,SAAS,CAAC,sBAAsB,CAAC,IAAI,SAA2B,GAAG,IAAI;IAOvE,8DAA8D;IAC9D,OAAO,CAAC,QAAQ;CAOjB"}
+{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/resource.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,qBAAkB;AAGtC,MAAM,MAAM,aAAa,GAAG;IAC1B,sGAAsG;IACtG,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,0EAA0E;IAC1E,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,kDAAkD;IAClD,QAAQ,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;CACjC,CAAC;AAEF;;GAEG;AACH,8BAAsB,QAAQ,CAAC,KAAK,SAAS,aAAa;IACxD,sCAAsC;IACtC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,CAI1C;IAEF,QAAQ,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC;IAE5C,+BAA+B;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IAChD,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACjC,OAAO,CAAC,OAAO,CAAS;IAExB,+CAA+C;IAC/C,SAAS,EAAE,OAAO,CAAS;IAC3B,6CAA6C;IAC7C,OAAO,CAAC,cAAc,CAAa;IACnC,iHAAiH;IACjH,OAAO,CAAC,kBAAkB,CAAsC;IAEhE;;OAEG;gBACS,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC;IAgBvE;;OAEG;IACH,OAAO,IAAI,IAAI;IAIf,gCAAgC;IAChC,MAAM,IAAI,IAAI;IAKd,QAAQ,IAAI,MAAM;IAIlB;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAMlB;;;OAGG;IACH,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,IAAI;IAIvD;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,IAAI;IAIvD;;OAEG;IACH,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,IAAI;IAMhE,gGAAgG;IAChG,wBAAwB,IAAI,IAAI;IAUhC,8FAA8F;IAC9F,SAAS,CAAC,eAAe,IAAI,IAAI;IAMjC,mGAAmG;IACnG,SAAS,CAAC,WAAW,IAAI,IAAI;IAM7B,qDAAqD;IACrD,SAAS,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,SAA2B,GAAG,IAAI;IAOpF,uDAAuD;IACvD,SAAS,CAAC,sBAAsB,CAAC,IAAI,SAA2B,GAAG,IAAI;IAOvE,8DAA8D;IAC9D,OAAO,CAAC,QAAQ;CAOjB"}

package/dist/adapter/resources/resource.js

@@ -1,7 +1,7 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { uid } from "../../utils/utils.js";
+import { uid } from "../../utils/uid.js";
 /**
  * Base class for GPU (WebGPU/WebGL) Resources
  */

package/dist/adapter/resources/shader.d.ts

@@ -1,6 +1,6 @@
 import type { Device } from "../device.js";
 import { Resource, ResourceProps } from "./resource.js";
-import { CompilerMessage } from "../../lib/compiler-log/compiler-message.js";
+import { CompilerMessage } from "../types/compiler-message.js";
 /**
  * Properties for a Shader
  */
@@ -41,7 +41,10 @@ export declare abstract class Shader extends Resource<ShaderProps> {
     getTranslatedSource(): string | null;
     /** In browser logging of errors */
     debugShader(trigger?: "never" | "always" | "errors" | "warnings"): Promise<void>;
-    /** In-browser UI logging of errors */
+    /**
+     * In-browser UI logging of errors
+     * TODO - this HTML formatting code should not be in Device, should be pluggable
+     */
     protected _displayShaderLog(messages: readonly CompilerMessage[]): void;
 }
 //# sourceMappingURL=shader.d.ts.map

package/dist/adapter/resources/shader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/shader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,qBAAkB;AACtC,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,sBAAmB;AAGnD,OAAO,EAAC,eAAe,EAAC,mDAAgD;AAIxE;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG;IACxC,yCAAyC;IACzC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACpC,yEAAyE;IACzE,KAAK,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;IAC1C,yBAAyB;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qCAAqC;IACrC,KAAK,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;CACpD,CAAC;AAEF;;;GAGG;AACH,8BAAsB,MAAO,SAAQ,QAAQ,CAAC,WAAW,CAAC;IACxD,OAAgB,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,CAQjD;IAEF,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;IAED,+BAA+B;IAC/B,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;IAClD,qCAAqC;IACrC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,wGAAwG;IACxG,iBAAiB,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAAa;IAE/D,mCAAmC;gBACvB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW;IAM9C,sCAAsC;IACtC,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;IAElE,kDAAkD;IAClD,sBAAsB,IAAI,SAAS,eAAe,EAAE,GAAG,IAAI;IAI3D,mHAAmH;IACnH,mBAAmB,IAAI,MAAM,GAAG,IAAI;IAMpC,mCAAmC;IAC7B,WAAW,CAAC,OAAO,6CAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB5D,sCAAsC;IACtC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,SAAS,eAAe,EAAE,GAAG,IAAI;CA2CxE"}
+{"version":3,"file":"shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/shader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,qBAAkB;AACtC,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,sBAAmB;AAGnD,OAAO,EAAC,eAAe,EAAC,qCAAkC;AAG1D;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG;IACxC,yCAAyC;IACzC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACpC,yEAAyE;IACzE,KAAK,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;IAC1C,yBAAyB;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qCAAqC;IACrC,KAAK,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;CACpD,CAAC;AAEF;;;GAGG;AACH,8BAAsB,MAAO,SAAQ,QAAQ,CAAC,WAAW,CAAC;IACxD,OAAgB,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,CAQjD;IAEF,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;IAED,+BAA+B;IAC/B,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;IAClD,qCAAqC;IACrC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,wGAAwG;IACxG,iBAAiB,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAAa;IAE/D,mCAAmC;gBACvB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW;IAM9C,sCAAsC;IACtC,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;IAElE,kDAAkD;IAClD,sBAAsB,IAAI,SAAS,eAAe,EAAE,GAAG,IAAI;IAI3D,mHAAmH;IACnH,mBAAmB,IAAI,MAAM,GAAG,IAAI;IAMpC,mCAAmC;IAC7B,WAAW,CAAC,OAAO,6CAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB5D;;;OAGG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,SAAS,eAAe,EAAE,GAAG,IAAI;CAyCxE"}

package/dist/adapter/resources/shader.js

@@ -3,9 +3,8 @@
 // Copyright (c) vis.gl contributors
 import { Resource } from "./resource.js";
 // import { log } from '../../utils/log';
-import { uid } from "../../utils/utils.js";
-import { formatCompilerLog } from "../../lib/compiler-log/format-compiler-log.js";
-import { getShaderInfo } from "../../lib/compiler-log/get-shader-info.js";
+import { uid } from "../../utils/uid.js";
+import { formatCompilerLog } from "../../adapter-utils/format-compiler-log.js";
 /**
  * Immutable Shader object
  * In WebGPU the handle can be copied between threads
@@ -66,13 +65,16 @@ export class Shader extends Resource {
         this._displayShaderLog(messages);
     }
     // PRIVATE
-    /** In-browser UI logging of errors */
+    /**
+     * In-browser UI logging of errors
+     * TODO - this HTML formatting code should not be in Device, should be pluggable
+     */
     _displayShaderLog(messages) {
         // Return if under Node.js / incomplete `document` polyfills
         if (typeof document === 'undefined' || !document?.createElement) {
             return;
         }
-        const shaderName = getShaderInfo(this.source).name;
+        const shaderName = getShaderName(this.source);
         const shaderTitle = `${this.stage} ${shaderName}`;
         let htmlLog = formatCompilerLog(messages, this.source, { showSourceCode: 'all', html: true });
         // Show translated source if available
@@ -95,9 +97,7 @@ ${htmlLog}
         button.style.textAlign = 'left';
         document.body.appendChild(button);
         const errors = document.getElementsByClassName('luma-compiler-log-error');
-        if (errors[0]?.scrollIntoView) {
-            errors[0].scrollIntoView();
-        }
+        errors[0]?.scrollIntoView();
         // TODO - add a small embedded copy button (instead of main button)
         button.onclick = () => {
             // const source = this.source.replaceAll('\n', '<br />');
@@ -110,5 +110,11 @@ ${htmlLog}
 // HELPERS
 /** Deduce an id, from shader source, or supplied id, or shader type */
 function getShaderIdFromProps(props) {
-    return getShaderInfo(props.source).name || props.id || uid(`unnamed ${props.stage}-shader`);
+    return getShaderName(props.source) || props.id || uid(`unnamed ${props.stage}-shader`);
+}
+/** Extracts GLSLIFY style naming of shaders: `#define SHADER_NAME ...` */
+function getShaderName(shader, defaultName = 'unnamed') {
+    const SHADER_NAME_REGEXP = /#define[\s*]SHADER_NAME[\s*]([A-Za-z0-9_-]+)[\s*]/;
+    const match = SHADER_NAME_REGEXP.exec(shader);
+    return match ? match[1] : defaultName;
 }

package/dist/adapter/resources/texture-view.d.ts

@@ -1,6 +1,6 @@
 import type { Device } from "../device.js";
 import type { Texture } from "./texture.js";
-import type { TextureFormat } from "../types/texture-formats.js";
+import type { TextureFormat } from "../../gpu-type-utils/texture-formats.js";
 import { Resource, ResourceProps } from "./resource.js";
 /** Properties for initializing a texture view */
 export type TextureViewProps = ResourceProps & {

package/dist/adapter/resources/texture-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"texture-view.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/texture-view.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,qBAAkB;AACtC,OAAO,KAAK,EAAC,OAAO,EAAC,qBAAkB;AACvC,OAAO,KAAK,EAAC,aAAa,EAAC,oCAAiC;AAC5D,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,sBAAmB;AAEnD,iDAAiD;AACjD,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,wIAAwI;IACxI,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,4CAA4C;IAC5C,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,IAAI,CAAC;IACpE,sFAAsF;IACtF,MAAM,CAAC,EAAE,KAAK,GAAG,cAAc,GAAG,YAAY,CAAC;IAC/C,uFAAuF;IACvF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8FAA8F;IAC9F,aAAa,EAAE,MAAM,CAAC;IACtB,mFAAmF;IACnF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+FAA+F;IAC/F,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,mCAAmC;AACnC,8BAAsB,WAAY,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IAClE,OAAgB,YAAY,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAStD;IAEF,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;IAED,0EAA0E;gBAC9D,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG;QAAC,OAAO,EAAE,OAAO,CAAA;KAAC;CAGzE"}
+{"version":3,"file":"texture-view.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/texture-view.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,qBAAkB;AACtC,OAAO,KAAK,EAAC,OAAO,EAAC,qBAAkB;AACvC,OAAO,KAAK,EAAC,aAAa,EAAC,gDAA6C;AACxE,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,sBAAmB;AAEnD,iDAAiD;AACjD,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,wIAAwI;IACxI,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,4CAA4C;IAC5C,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,IAAI,CAAC;IACpE,sFAAsF;IACtF,MAAM,CAAC,EAAE,KAAK,GAAG,cAAc,GAAG,YAAY,CAAC;IAC/C,uFAAuF;IACvF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8FAA8F;IAC9F,aAAa,EAAE,MAAM,CAAC;IACtB,mFAAmF;IACnF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+FAA+F;IAC/F,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,mCAAmC;AACnC,8BAAsB,WAAY,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IAClE,OAAgB,YAAY,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAStD;IAEF,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;IAED,0EAA0E;gBAC9D,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG;QAAC,OAAO,EAAE,OAAO,CAAA;KAAC;CAGzE"}

package/dist/adapter/resources/texture.d.ts

@@ -1,70 +1,138 @@
-/// <reference types="node" />
 import type { Device } from "../device.js";
 import type { TypedArray } from "../../types.js";
-import type { TextureFormat } from "../types/texture-formats.js";
+import type { TextureFormat } from "../../gpu-type-utils/texture-formats.js";
+import type { TextureView, TextureViewProps } from "./texture-view.js";
 import { Resource, ResourceProps } from "./resource.js";
 import { Sampler, SamplerProps } from "./sampler.js";
-import { TextureView, TextureViewProps } from "./texture-view.js";
-/** Data types that can be used to initialize textures */
-export type TextureData = TypedArray | ArrayBuffer | Buffer | ImageBitmap | HTMLImageElement;
-export type CubeTextureData = Record<string, TextureData> | Record<string, Promise<TextureData>>;
-export type ExternalTextureData = HTMLVideoElement;
-/** Abstract Texture interface */
-export type TextureProps = ResourceProps & {
+/**
+ * These represent the main compressed texture formats
+ * Each format typically has a number of more specific subformats
+ */
+export type TextureCompressionFormat = 'dxt' | 'dxt-srgb' | 'etc1' | 'etc2' | 'pvrtc' | 'atc' | 'astc' | 'rgtc';
+/** Names of cube texture faces */
+export type TextureCubeFace = '+X' | '-X' | '+Y' | '-Y' | '+Z' | '-Z';
+/**
+ * One mip level
+ * Basic data structure is similar to `ImageData`
+ * additional optional fields can describe compressed texture data.
+ */
+export type TextureLevelData = {
+    /** WebGPU style format string. Defaults to 'rgba8unorm' */
+    format?: TextureFormat;
+    data: TypedArray;
+    width: number;
+    height: number;
+    compressed?: boolean;
+    byteLength?: number;
+    hasAlpha?: boolean;
+};
+/**
+ * Built-in data types that can be used to initialize textures
+ * @note ImageData can be used for 8 bit data via Uint8ClampedArray
+ */
+export type ExternalImage = ImageBitmap | ImageData | HTMLImageElement | HTMLVideoElement | VideoFrame | HTMLCanvasElement | OffscreenCanvas;
+export type TextureLevelSource = TextureLevelData | ExternalImage;
+/** Texture data can be one or more mip levels */
+export type TextureData = TextureLevelData | ExternalImage | (TextureLevelData | ExternalImage)[];
+/** @todo - define what data type is supported for 1D textures */
+export type Texture1DData = TypedArray | TextureLevelData;
+/** Texture data can be one or more mip levels */
+export type Texture2DData = TypedArray | TextureLevelData | ExternalImage | (TextureLevelData | ExternalImage)[];
+/** Array of textures */
+export type Texture3DData = TypedArray | TextureData[];
+/** 6 face textures */
+export type TextureCubeData = Record<TextureCubeFace, Texture2DData>;
+/** Array of textures */
+export type TextureArrayData = TextureData[];
+/** Array of 6 face textures */
+export type TextureCubeArrayData = Record<TextureCubeFace, TextureData>[];
+export type TextureDataProps = Texture1DProps | Texture2DProps | Texture3DProps | TextureArrayProps | TextureCubeProps | TextureCubeArrayProps;
+export type Texture1DProps = {
+    dimension: '1d';
+    data?: Texture1DData | null;
+};
+export type Texture2DProps = {
+    dimension?: '2d';
+    data?: Texture2DData | null;
+};
+export type Texture3DProps = {
+    dimension: '3d';
+    data?: Texture3DData | null;
+};
+export type TextureArrayProps = {
+    dimension: '2d-array';
+    data?: TextureArrayData | null;
+};
+export type TextureCubeProps = {
+    dimension: 'cube';
+    data?: TextureCubeData | null;
+};
+export type TextureCubeArrayProps = {
+    dimension: 'cube-array';
+    data: TextureCubeArrayData | null;
+};
+/** Texture properties */
+export type TextureProps = ResourceProps & TextureDataProps & {
     format?: TextureFormat;
-    dimension?: '1d' | '2d' | '2d-array' | 'cube' | 'cube-array' | '3d';
     width?: number | undefined;
     height?: number | undefined;
     depth?: number;
     usage?: number;
-    data?: TextureData | Promise<TextureData> | CubeTextureData | string | HTMLVideoElement | null;
-    mipmaps?: boolean;
-    mipLevels?: number;
+    /** How many mip levels */
+    mipLevels?: number | 'pyramid';
+    /** Multi sampling */
     samples?: number;
-    type?: number;
-    compressed?: boolean;
+    /** Specifying mipmaps will default mipLevels to 'pyramid' and attempt to generate mipmaps */
+    mipmaps?: boolean;
+    /** Sampler (or SamplerProps) for the default sampler for this texture. Used if no sampler provided. Note that other samplers can still be used. */
     sampler?: Sampler | SamplerProps;
+    /** Props for the default TextureView for this texture. Note that other views can still be created and used. */
     view?: TextureViewProps;
+    /** @deprecated - this is implicit from format */
+    compressed?: boolean;
 };
-export type WebGPUTextureProps = ResourceProps & {
-    width: number;
-    height: number;
+/** Options for Texture.copyExternalImage */
+export type CopyExternalImageOptions = {
+    /** Image */
+    image: ExternalImage;
+    /** Copy from image x offset (default 0) */
+    sourceX?: number;
+    /** Copy from image y offset (default 0) */
+    sourceY?: number;
+    /** Copy area width (default 1) */
+    width?: number;
+    /** Copy area height (default 1) */
+    height?: number;
+    /** Copy depth (default 1) */
     depth?: number;
-    mipLevels?: number;
-    format?: string;
-};
-/**
- * @deprecated
- * @todo remove, are these even used anymore?
- */
-export type DeprecatedWebGLTextureProps = {
-    /** @deprecated use props.sampler */
-    parameters?: Record<number, number>;
-    /** @deprecated use props.data */
-    pixels?: any;
-    /** @deprecated use props.format */
-    dataFormat?: number | null;
-    /** @deprecated rarely supported */
-    border?: number;
-    /** @deprecated WebGL only. */
-    pixelStore?: object;
-    /** @deprecated WebGL only. */
-    textureUnit?: number;
-    /** @deprecated WebGL only. Use dimension. */
-    target?: number;
+    /** Which mip-level to copy into (default 0) */
+    mipLevel?: number;
+    /** Start copying into offset x (default 0) */
+    x?: number;
+    /** Start copying into offset y (default 0) */
+    y?: number;
+    /** Start copying from depth layer z (default 0) */
+    z?: number;
+    /** When copying into depth stencil textures (default 'all') */
+    aspect?: 'all' | 'stencil-only' | 'depth-only';
+    /** Specific color space of image data */
+    colorSpace?: 'srgb';
+    /** premultiplied  */
+    premultipliedAlpha?: boolean;
 };
 /**
  * Abstract Texture interface
  * Texture Object
  * https://gpuweb.github.io/gpuweb/#gputexture
  */
-export declare abstract class Texture<Props extends TextureProps = TextureProps> extends Resource<Props> {
-    static defaultProps: Required<TextureProps>;
+export declare abstract class Texture extends Resource<TextureProps> {
     static COPY_SRC: number;
     static COPY_DST: number;
-    static TEXTURE_BINDING: number;
-    static STORAGE_BINDING: number;
+    static TEXTURE: number;
+    static STORAGE: number;
     static RENDER_ATTACHMENT: number;
+    static CubeFaces: TextureCubeFace[];
+    static defaultProps: Required<TextureProps>;
     get [Symbol.toStringTag](): string;
     /** dimension of this texture */
     readonly dimension: '1d' | '2d' | '2d-array' | 'cube' | 'cube-array' | '3d';
@@ -75,16 +143,45 @@ export declare abstract class Texture<Props extends TextureProps = TextureProps>
     /** height in pixels of this texture */
     height: number;
     /** depth of this texture */
-    readonly depth: number;
+    depth: number;
+    /** mip levels in this texture */
+    mipLevels: number;
     /** Default sampler for this texture */
     abstract sampler: Sampler;
     /** Default view for this texture */
     abstract view: TextureView;
     /** "Time" of last update. Monotonically increasing timestamp */
     updateTimestamp: number;
+    /** Check if data is an external image */
+    static isExternalImage(data: unknown): data is ExternalImage;
+    /** Determine size (width and height) of provided image data */
+    static getExternalImageSize(data: ExternalImage): {
+        width: number;
+        height: number;
+    };
+    /** Check if texture data is a typed array */
+    static isTextureLevelData(data: TextureData): data is TextureLevelData;
+    /** Get the size of the texture described by the provided TextureData */
+    static getTextureDataSize(data: TextureData | TextureCubeData | TextureArrayData | TextureCubeArrayData | TypedArray): {
+        width: number;
+        height: number;
+    } | null;
+    /** Calculate the number of mip levels for a texture of width and height */
+    static getMipLevelCount(width: number, height: number): number;
+    /** Convert luma.gl cubemap face constants to depth index */
+    static getCubeFaceDepth(face: TextureCubeFace): number;
     /** Do not use directly. Create with device.createTexture() */
-    constructor(device: Device, props: Props, defaultProps?: Required<Props>);
+    constructor(device: Device, props: TextureProps);
     /** Create a texture view for this texture */
-    abstract createView(props?: TextureViewProps): TextureView;
+    abstract createView(props: TextureViewProps): TextureView;
+    /** Set sampler props associated with this texture */
+    abstract setSampler(sampler?: Sampler | SamplerProps): void;
+    /** Copy external image data into the texture */
+    abstract copyExternalImage(options: CopyExternalImageOptions): {
+        width: number;
+        height: number;
+    };
+    /** Default options */
+    protected static defaultCopyExternalImageOptions: Required<CopyExternalImageOptions>;
 }
 //# sourceMappingURL=texture.d.ts.map

package/dist/adapter/resources/texture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"texture.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/texture.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,qBAAkB;AACtC,OAAO,KAAK,EAAC,UAAU,EAAC,uBAAoB;AAC5C,OAAO,KAAK,EAAC,aAAa,EAAC,oCAAiC;AAC5D,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,sBAAmB;AACnD,OAAO,EAAC,OAAO,EAAE,YAAY,EAAC,qBAAkB;AAChD,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAC,0BAAuB;AAS7D,yDAAyD;AACzD,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,MAAM,GAAG,WAAW,GAAG,gBAAgB,CAAC;AAE7F,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;AAEjG,MAAM,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAEnD,iCAAiC;AACjC,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG;IACzC,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,SAAS,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,IAAI,CAAC;IACpE,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,eAAe,GAAG,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAC/F,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,OAAO,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC;IACjC,IAAI,CAAC,EAAE,gBAAgB,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG;IAC/C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,oCAAoC;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,iCAAiC;IACjC,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,mCAAmC;IACnC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8BAA8B;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8BAA8B;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6CAA6C;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;GAIG;AACH,8BAAsB,OAAO,CAAC,KAAK,SAAS,YAAY,GAAG,YAAY,CAAE,SAAQ,QAAQ,CAAC,KAAK,CAAC;IAC9F,OAAgB,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC,CAmBlD;IAEF,MAAM,CAAC,QAAQ,SAAQ;IACvB,MAAM,CAAC,QAAQ,SAAQ;IACvB,MAAM,CAAC,eAAe,SAAQ;IAC9B,MAAM,CAAC,eAAe,SAAQ;IAC9B,MAAM,CAAC,iBAAiB,SAAQ;IAEhC,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;IAED,gCAAgC;IAChC,QAAQ,CAAC,SAAS,EAAE,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,IAAI,CAAC;IAC5E,6BAA6B;IAC7B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,4BAA4B;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEvB,uCAAuC;IACvC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B,oCAAoC;IACpC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B,gEAAgE;IAChE,eAAe,EAAE,MAAM,CAAC;IAExB,8DAA8D;gBAE5D,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,YAAY,kBAA0C;IAaxD,6CAA6C;IAC7C,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,gBAAgB,GAAG,WAAW;CAC3D"}
+{"version":3,"file":"texture.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/texture.ts"],"names":[],"mappings":"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"}