@luma.gl/webgl 9.0.11 → 9.1.0-alpha.2

package/dist/adapter/resources/webgl-framebuffer.js

@@ -1,19 +1,17 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { Framebuffer, assert } from '@luma.gl/core';
+import { Framebuffer } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
 import { WEBGLTexture } from "./webgl-texture.js";
-import { WEBGLTextureView } from "./webgl-texture-view.js";
 import { getDepthStencilAttachmentWebGL } from "../converters/texture-formats.js";
 /** luma.gl Framebuffer, WebGL implementation  */
 export class WEBGLFramebuffer extends Framebuffer {
     device;
     gl;
     handle;
-    get texture() {
-        return this.colorAttachments[0];
-    }
+    colorAttachments = [];
+    depthStencilAttachment = null;
     constructor(device, props) {
         super(device, props);
         // WebGL default framebuffer handle is null
@@ -35,11 +33,11 @@ export class WEBGLFramebuffer extends Framebuffer {
                 const attachment = this.colorAttachments[i];
                 const attachmentPoint = 36064 + i;
                 if (attachment) {
-                    this._attachOne(attachmentPoint, attachment);
+                    this._attachTexture(attachmentPoint, attachment);
                 }
             }
             if (this.depthStencilAttachment) {
-                this._attachOne(getDepthStencilAttachmentWebGL(this.depthStencilAttachment.props.format), this.depthStencilAttachment);
+                this._attachTexture(getDepthStencilAttachmentWebGL(this.depthStencilAttachment.props.format), this.depthStencilAttachment);
             }
             /** Check the status */
             // @ts-expect-error
@@ -74,74 +72,58 @@ export class WEBGLFramebuffer extends Framebuffer {
     }
     /**
      * Attachment resize is expected to be a noop if size is same
-     */
-    resizeAttachments(width, height) {
-        // for default framebuffer, just update the stored size
-        if (this.handle === null) {
-            // assert(width === undefined && height === undefined);
-            this.width = this.gl.drawingBufferWidth;
-            this.height = this.gl.drawingBufferHeight;
-            return this;
-        }
-        if (width === undefined) {
-            width = this.gl.drawingBufferWidth;
-        }
-        if (height === undefined) {
-            height = this.gl.drawingBufferHeight;
-        }
-        // TODO Not clear that this is better than default destroy/create implementation
-        for (const colorAttachment of this.colorAttachments) {
-            colorAttachment.texture.resize({ width, height });
-        }
-        if (this.depthStencilAttachment) {
-            this.depthStencilAttachment.texture.resize({ width, height });
-        }
+     *
+    protected override resizeAttachments(width: number, height: number): this {
+      // for default framebuffer, just update the stored size
+      if (this.handle === null) {
+        // assert(width === undefined && height === undefined);
+        this.width = this.gl.drawingBufferWidth;
+        this.height = this.gl.drawingBufferHeight;
         return this;
+      }
+  
+      if (width === undefined) {
+        width = this.gl.drawingBufferWidth;
+      }
+      if (height === undefined) {
+        height = this.gl.drawingBufferHeight;
+      }
+  
+      // TODO Not clear that this is better than default destroy/create implementation
+  
+      for (const colorAttachment of this.colorAttachments) {
+        colorAttachment.texture.clone({width, height});
+      }
+      if (this.depthStencilAttachment) {
+        this.depthStencilAttachment.texture.resize({width, height});
+      }
+      return this;
     }
+    */
     /** Attach one attachment */
-    _attachOne(attachmentPoint, attachment) {
+    _attachTexture(attachmentPoint, textureView) {
         // if (attachment instanceof WEBGLRenderbuffer) {
         //   this._attachWEBGLRenderbuffer(attachmentPoint, attachment);
         //   return attachment;
         // }
-        if (Array.isArray(attachment)) {
-            const [texture, layer = 0, level = 0] = attachment;
-            this._attachTexture(attachmentPoint, texture, layer, level);
-            return texture;
-        }
-        if (attachment instanceof WEBGLTexture) {
-            this._attachTexture(attachmentPoint, attachment, 0, 0);
-            return attachment;
-        }
-        if (attachment instanceof WEBGLTextureView) {
-            const textureView = attachment;
-            this._attachTexture(attachmentPoint, textureView.texture, textureView.props.baseMipLevel, textureView.props.baseArrayLayer);
-            return attachment.texture;
-        }
-        throw new Error('attach');
+        this._attachTextureView(attachmentPoint, textureView);
     }
-    // TODO - we do not seem to need render buffers in WebGL 2
-    // protected _attachWEBGLRenderbuffer(attachment: GL, renderbuffer: WEBGLRenderbuffer): void {
-    //   this.gl.framebufferRenderbuffer(
-    //     GL.FRAMEBUFFER,
-    //     attachment,
-    //     GL.RENDERBUFFER,
-    //     renderbuffer.handle
-    //   );
-    // }
     /**
      * @param attachment
      * @param texture
      * @param layer = 0 - index into WEBGLTextureArray and Texture3D or face for `TextureCubeMap`
      * @param level = 0 - mipmapLevel
      */
-    _attachTexture(attachment, texture, layer, level) {
+    _attachTextureView(attachment, textureView) {
         const { gl } = this.device;
-        gl.bindTexture(texture.target, texture.handle);
-        switch (texture.target) {
+        const { texture } = textureView;
+        const level = textureView.props.baseMipLevel;
+        const layer = textureView.props.baseArrayLayer;
+        gl.bindTexture(texture.glTarget, texture.handle);
+        switch (texture.glTarget) {
             case 35866:
             case 32879:
-                gl.framebufferTextureLayer(36160, attachment, texture.target, level, layer);
+                gl.framebufferTextureLayer(36160, attachment, texture.glTarget, level, layer);
                 break;
             case 34067:
                 // layer must be a cubemap face (or if index, converted to cube map face)
@@ -152,9 +134,9 @@ export class WEBGLFramebuffer extends Framebuffer {
                 gl.framebufferTexture2D(36160, attachment, 3553, texture.handle, level);
                 break;
             default:
-                assert(false, 'Illegal texture type');
+                throw new Error('Illegal texture type');
         }
-        gl.bindTexture(texture.target, null);
+        gl.bindTexture(texture.glTarget, null);
     }
 }
 // Helper functions

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

@@ -1,4 +1,5 @@
-import { RenderPass, RenderPassProps, NumberArray, RenderPassParameters } from '@luma.gl/core';
+import { NumericArray } from '@math.gl/types';
+import { RenderPass, RenderPassProps, RenderPassParameters } from '@luma.gl/core';
 import { WebGLDevice } from "../webgl-device.js";
 import { GLParameters } from '@luma.gl/constants';
 export declare class WEBGLRenderPass extends RenderPass {
@@ -23,6 +24,6 @@ export declare class WEBGLRenderPass extends RenderPass {
     /**
      * WebGL2 - clear a specific color buffer
      */
-    protected clearColorBuffer(drawBuffer?: number, value?: NumberArray): void;
+    protected clearColorBuffer(drawBuffer?: number, value?: NumericArray): void;
 }
 //# sourceMappingURL=webgl-render-pass.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"webgl-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,WAAW,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAC7F,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAK,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAcpD,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,8DAA8D;IAC9D,YAAY,EAAE,YAAY,CAAC;gBAEf,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe;IAYvD,GAAG,IAAI,IAAI;IAKX,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa,IAAI,IAAI;IACrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAO5C;;OAEG;IACH,aAAa,CAAC,UAAU,GAAE,oBAAyB,GAAG,IAAI;IAqD1D,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAKpC,iBAAiB,IAAI,IAAI;IAOlC;;OAEG;IACH,SAAS,CAAC,KAAK,IAAI,IAAI;IA+BvB;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,UAAU,GAAE,MAAU,EAAE,KAAK,GAAE,WAA0B;CAwCrF"}
+{"version":3,"file":"webgl-render-pass.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAChF,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAK,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAcpD,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,8DAA8D;IAC9D,YAAY,EAAE,YAAY,CAAC;gBAEf,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe;IAYvD,GAAG,IAAI,IAAI;IAKX,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa,IAAI,IAAI;IACrB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAO5C;;OAEG;IACH,aAAa,CAAC,UAAU,GAAE,oBAAyB,GAAG,IAAI;IAmD1D,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAKpC,iBAAiB,IAAI,IAAI;IAOlC;;OAEG;IACH,SAAS,CAAC,KAAK,IAAI,IAAI;IA+BvB;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,UAAU,GAAE,MAAU,EAAE,KAAK,GAAE,YAA2B;CAwCtF"}

package/dist/adapter/resources/webgl-render-pass.js

@@ -41,9 +41,7 @@ export class WEBGLRenderPass extends RenderPass {
     setParameters(parameters = {}) {
         const glParameters = { ...this.glParameters };
         // Framebuffers are specified using parameters in WebGL
-        if (this.props.framebuffer) {
-            glParameters.framebuffer = this.props.framebuffer;
-        }
+        glParameters.framebuffer = this.props.framebuffer || null;
         if (this.props.depthReadOnly) {
             glParameters.depthMask = !this.props.depthReadOnly;
         }

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

@@ -1 +1 @@
-{"version":3,"file":"webgl-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pipeline.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,mBAAmB,EAAE,wBAAwB,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AACpG,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AACvE,OAAO,KAAK,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,cAAc,EAAsC,MAAM,eAAe,CAAC;AAUlF,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C,OAAO,EAAC,WAAW,EAAC,0BAAuB;AAK3C,OAAO,EAAC,sBAAsB,EAAC,sCAAmC;AAKlE,oCAAoC;AACpC,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,yDAAyD;IACzD,MAAM,EAAE,WAAW,CAAC;IACpB,yCAAyC;IACzC,MAAM,EAAE,YAAY,CAAC;IACrB,oBAAoB;IACpB,EAAE,EAAE,WAAW,CAAC;IAChB,sBAAsB;IACtB,EAAE,EAAE,WAAW,CAAC;IAChB,mEAAmE;IACnE,kBAAkB,EAAE,YAAY,CAAC;IAEjC,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IAC5C,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IACvC,qBAAqB;IACrB,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAQ;IAEjC,aAAa,EAAE,MAAM,CAAK;IAC1B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAM;gBAEnC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IAyClD,OAAO,IAAI,IAAI;IAQxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,IAAI;IAyD3F;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,UAAU,CAAC,EAAE,wBAAwB,CAAC;QACtC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;QAC7B,WAAW,EAAE,WAAW,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;KAC5C,GAAG,OAAO;IA8FF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;cAkBhD,YAAY;IA2B5B,wFAAwF;IACxF,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,YAAY;IAmB9D;;;;OAIG;IACH,cAAc,IAAI,SAAS,GAAG,SAAS,GAAG,YAAY;IAmBtD,6DAA6D;IACvD,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3C;;;;OAIG;IACH,sBAAsB;IAatB,iDAAiD;IACjD,cAAc;IAyFd;;;OAGG;IACH,cAAc;CASf"}
+{"version":3,"file":"webgl-render-pipeline.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-render-pipeline.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,mBAAmB,EAAE,wBAAwB,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AACpG,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AACvE,OAAO,KAAK,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,cAAc,EAAM,MAAM,eAAe,CAAC;AAUlD,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C,OAAO,EAAC,WAAW,EAAC,0BAAuB;AAK3C,OAAO,EAAC,sBAAsB,EAAC,sCAAmC;AAKlE,oCAAoC;AACpC,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,yDAAyD;IACzD,MAAM,EAAE,WAAW,CAAC;IACpB,yCAAyC;IACzC,MAAM,EAAE,YAAY,CAAC;IACrB,oBAAoB;IACpB,EAAE,EAAE,WAAW,CAAC;IAChB,sBAAsB;IACtB,EAAE,EAAE,WAAW,CAAC;IAChB,mEAAmE;IACnE,kBAAkB,EAAE,YAAY,CAAC;IAEjC,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IAC5C,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IACvC,qBAAqB;IACrB,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAQ;IAEjC,aAAa,EAAE,MAAM,CAAK;IAC1B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAM;gBAEnC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IA8BlD,OAAO,IAAI,IAAI;IAQxB;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,IAAI;IAyD3F;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,UAAU,CAAC,EAAE,wBAAwB,CAAC;QACtC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;QAC7B,WAAW,EAAE,WAAW,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;KAC5C,GAAG,OAAO;IAgGF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;cAkBhD,YAAY;IA2B5B,wFAAwF;IACxF,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,YAAY;IAmB9D;;;;OAIG;IACH,cAAc,IAAI,SAAS,GAAG,SAAS,GAAG,YAAY;IAmBtD,6DAA6D;IACvD,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3C;;;;OAIG;IACH,sBAAsB;IAsBtB,iDAAiD;IACjD,cAAc;IAyFd;;;OAGG;IACH,cAAc;CASf"}

package/dist/adapter/resources/webgl-render-pipeline.js

@@ -1,13 +1,13 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { RenderPipeline, cast, splitUniformsAndBindings, log } from '@luma.gl/core';
-import { mergeShaderLayout } from '@luma.gl/core';
-// import {mergeShaderLayout, getAttributeInfosFromLayouts} from '@luma.gl/core';
+import { RenderPipeline, log } from '@luma.gl/core';
+// import {getAttributeInfosFromLayouts} from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
 import { getShaderLayout } from "../helpers/get-shader-layout.js";
 import { withDeviceAndGLParameters } from "../converters/device-parameters.js";
 import { setUniform } from "../helpers/set-uniform.js";
+import { splitUniformsAndBindings } from "../../utils/split-uniforms-and-bindings.js";
 import { WEBGLBuffer } from "./webgl-buffer.js";
 import { WEBGLFramebuffer } from "./webgl-framebuffer.js";
 import { WEBGLTexture } from "./webgl-texture.js";
@@ -40,8 +40,8 @@ export class WEBGLRenderPipeline extends RenderPipeline {
         this.handle = this.props.handle || this.device.gl.createProgram();
         this.device.setSpectorMetadata(this.handle, { id: this.props.id });
         // Create shaders if needed
-        this.vs = cast(props.vs);
-        this.fs = cast(props.fs);
+        this.vs = props.vs;
+        this.fs = props.fs;
         // assert(this.vs.stage === 'vertex');
         // assert(this.fs.stage === 'fragment');
         // Setup varyings if supplied
@@ -57,14 +57,6 @@ export class WEBGLRenderPipeline extends RenderPipeline {
         log.timeEnd(1, `RenderPipeline ${this.id} - shaderLayout introspection`)();
         // Merge provided layout with introspected layout
         this.shaderLayout = mergeShaderLayout(this.introspectedLayout, props.shaderLayout);
-        // WebGPU has more restrictive topology support than WebGL
-        switch (this.props.topology) {
-            case 'triangle-fan-webgl':
-            case 'line-loop-webgl':
-                log.warn(`Primitive topology ${this.props.topology} is deprecated and will be removed in v9.1`);
-                break;
-            default:
-        }
     }
     destroy() {
         if (this.handle) {
@@ -148,15 +140,17 @@ export class WEBGLRenderPipeline extends RenderPipeline {
         // Note: async textures set as uniforms might still be loading.
         // Now that all uniforms have been updated, check if any texture
         // in the uniforms is not yet initialized, then we don't draw
-        if (!this._areTexturesRenderable() || vertexCount === 0) {
+        if (!this._areTexturesRenderable()) {
             log.info(2, `RenderPipeline:${this.id}.draw() aborted - textures not yet loaded`)();
+            //  Note: false means that the app needs to redraw the pipeline again.
             return false;
         }
         // (isInstanced && instanceCount === 0)
-        if (vertexCount === 0) {
-            log.info(2, `RenderPipeline:${this.id}.draw() aborted - no vertices to draw`)();
-            return true;
-        }
+        // if (vertexCount === 0) {
+        //   log.info(2, `RenderPipeline:${this.id}.draw() aborted - no vertices to draw`)();
+        //   Note: false means that the app needs to redraw the pipeline again.
+        //   return true;
+        // }
         this.device.gl.useProgram(this.handle);
         // Note: Rebinds constant attributes before each draw call
         vertexArray.bindBeforeRender(renderPass);
@@ -289,10 +283,16 @@ export class WEBGLRenderPipeline extends RenderPipeline {
      */
     _areTexturesRenderable() {
         let texturesRenderable = true;
+        for (const bindingInfo of this.shaderLayout.bindings) {
+            if (!this.bindings[bindingInfo.name] &&
+                !this.bindings[bindingInfo.name.replace(/Uniforms$/, '')]) {
+                log.warn(`Binding ${bindingInfo.name} not found in ${this.id}`)();
+                texturesRenderable = false;
+            }
+        }
         for (const [, texture] of Object.entries(this.bindings)) {
             if (texture instanceof WEBGLTexture) {
                 texture.update();
-                texturesRenderable = texturesRenderable && texture.loaded;
             }
         }
         return texturesRenderable;
@@ -359,7 +359,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
                         throw new Error('No texture');
                     }
                     gl.activeTexture(33984 + textureUnit);
-                    gl.bindTexture(texture.target, texture.handle);
+                    gl.bindTexture(texture.glTarget, texture.handle);
                     // gl.bindSampler(textureUnit, sampler.handle);
                     textureUnit += 1;
                     break;
@@ -386,3 +386,28 @@ export class WEBGLRenderPipeline extends RenderPipeline {
         }
     }
 }
+/**
+ * Merges an provided shader layout into a base shader layout
+ * In WebGL, this allows the auto generated shader layout to be overridden by the application
+ * Typically to change the format of the vertex attributes (from float32x4 to uint8x4 etc).
+ * @todo Drop this? Aren't all use cases covered by mergeBufferLayout()?
+ */
+function mergeShaderLayout(baseLayout, overrideLayout) {
+    // Deep clone the base layout
+    const mergedLayout = {
+        ...baseLayout,
+        attributes: baseLayout.attributes.map(attribute => ({ ...attribute }))
+    };
+    // Merge the attributes
+    for (const attribute of overrideLayout?.attributes || []) {
+        const baseAttribute = mergedLayout.attributes.find(attr => attr.name === attribute.name);
+        if (!baseAttribute) {
+            log.warn(`shader layout attribute ${attribute.name} not present in shader`);
+        }
+        else {
+            baseAttribute.type = attribute.type || baseAttribute.type;
+            baseAttribute.stepMode = attribute.stepMode || baseAttribute.stepMode;
+        }
+    }
+    return mergedLayout;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"webgl-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-shader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAM,MAAM,eAAe,CAAC;AAGxE,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C;;GAEG;AACH,qBAAa,WAAY,SAAQ,MAAM;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;gBAEjB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW;IAgB1C,OAAO,IAAI,IAAI;IAST,kBAAkB,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;IAK/D,sBAAsB;IAKtB,mBAAmB,IAAI,MAAM,GAAG,IAAI;IAQ7C,kDAAkD;cAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCvD,6DAA6D;cAC7C,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB5D;;;;OAIG;IACH,SAAS,CAAC,qBAAqB;CAKhC"}
+{"version":3,"file":"webgl-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-shader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAM,MAAM,eAAe,CAAC;AAGxE,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C;;GAEG;AACH,qBAAa,WAAY,SAAQ,MAAM;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;gBAEjB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW;IAgB1C,OAAO,IAAI,IAAI;IAST,kBAAkB,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;IAK/D,sBAAsB,IAAI,SAAS,eAAe,EAAE;IAKpD,mBAAmB,IAAI,MAAM,GAAG,IAAI;IAQ7C,kDAAkD;cAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCvD,6DAA6D;cAC7C,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB5D;;;;OAIG;IACH,SAAS,CAAC,qBAAqB;CAKhC"}

package/dist/adapter/resources/webgl-shader.js

@@ -39,12 +39,12 @@ export class WEBGLShader extends Shader {
     }
     getCompilationInfoSync() {
         const log = this.device.gl.getShaderInfoLog(this.handle);
-        return parseShaderCompilerLog(log);
+        return log ? parseShaderCompilerLog(log) : [];
     }
     getTranslatedSource() {
         const extensions = this.device.getExtension('WEBGL_debug_shaders');
         const ext = extensions.WEBGL_debug_shaders;
-        return ext?.getTranslatedShaderSource(this.handle);
+        return ext?.getTranslatedShaderSource(this.handle) || null;
     }
     // PRIVATE METHODS
     /** Compile a shader and get compilation status */

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

@@ -5,7 +5,7 @@ import { WEBGLTexture } from "./webgl-texture.js";
 export declare class WEBGLTextureView extends TextureView {
     readonly device: WebGLDevice;
     readonly gl: WebGL2RenderingContext;
-    readonly handle: WebGLTexture;
+    readonly handle: null;
     readonly texture: WEBGLTexture;
     constructor(device: Device, props: TextureViewProps & {
         texture: WEBGLTexture;

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

@@ -1 +1 @@
-{"version":3,"file":"webgl-texture-view.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-texture-view.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAC,WAAW,EAAU,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAE7C,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,sBAAsB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAE9B,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;gBAEnB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG;QAAC,OAAO,EAAE,YAAY,CAAA;KAAC;CAS9E"}
+{"version":3,"file":"webgl-texture-view.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-texture-view.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAC,WAAW,EAAU,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAE7C,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,sBAAsB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;gBAEnB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG;QAAC,OAAO,EAAE,YAAY,CAAA;KAAC;CAQ9E"}

package/dist/adapter/resources/webgl-texture-view.js

@@ -6,7 +6,7 @@ import { TextureView, Texture } from '@luma.gl/core';
 export class WEBGLTextureView extends TextureView {
     device;
     gl;
-    handle;
+    handle; // Does not have a WebGL representation
     texture;
     constructor(device, props) {
         super(device, { ...Texture.defaultProps, ...props });

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

@@ -1,211 +1,97 @@
-import { Device, TextureProps, TextureViewProps, Sampler, SamplerProps, TypedArray } from '@luma.gl/core';
+import type { Device, TextureProps, TextureViewProps, Sampler, SamplerProps, TextureCubeFace, Texture1DData, Texture2DData, Texture3DData, TextureCubeData, TextureArrayData, TextureCubeArrayData } from '@luma.gl/core';
 import { Texture } from '@luma.gl/core';
-import { GL, GLSamplerParameters } from '@luma.gl/constants';
+import { GL, GLPixelType, GLSamplerParameters, GLTexelDataFormat, GLTextureTarget } from '@luma.gl/constants';
 import { WebGLDevice } from "../webgl-device.js";
 import { WEBGLSampler } from "./webgl-sampler.js";
 import { WEBGLTextureView } from "./webgl-texture-view.js";
-export type WEBGLTextureProps = TextureProps & {
-    /** @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;
-};
-export declare const DEFAULT_WEBGL_TEXTURE_PROPS: {
-    parameters: {};
-    pixelStore: {};
-    pixels: any;
-    border: number;
-    dataFormat: any;
-    textureUnit: any;
-    target: any;
-};
-export type TextureSourceData = TypedArray | ImageData | HTMLImageElement | HTMLCanvasElement | ImageBitmap | HTMLVideoElement;
-type SetImageDataOptions = {
-    target?: number;
-    level?: number;
-    dataFormat?: any;
-    width?: number;
-    height?: number;
-    depth?: number;
-    glFormat?: GL;
-    type?: any;
-    offset?: number;
-    data: any;
-    compressed?: boolean;
-    parameters?: Record<GL, any>;
-    /** @deprecated */
-    pixels?: any;
-};
 /**
- * @param {*} pixels, data -
- *  null - create empty texture of specified format
- *  Typed array - init from image data in typed array
- *  Buffer|WebGLBuffer - (WEBGL2) init from image data in WebGLBuffer
- *  HTMLImageElement|Image - Inits with content of image. Auto width/height
- *  HTMLCanvasElement - Inits with contents of canvas. Auto width/height
- *  HTMLVideoElement - Creates video texture. Auto width/height
- *
- * @param  x - xOffset from where texture to be updated
- * @param  y - yOffset from where texture to be updated
- * @param  width - width of the sub image to be updated
- * @param  height - height of the sub image to be updated
- * @param  level - mip level to be updated
- * @param {GLenum} format - internal format of image data.
- * @param {GLenum} type
- *  - format of array (autodetect from type) or
- *  - (WEBGL2) format of buffer or ArrayBufferView
- * @param {GLenum} dataFormat - format of image data.
- * @param {Number} offset - (WEBGL2) offset from start of buffer
- * @parameters - temporary settings to be applied, can be used to supply pixel store settings.
+ * WebGL... the texture API from hell... hopefully made simpler
  */
-type SetSubImageDataOptions = {
-    target?: number;
-    level?: number;
-    dataFormat?: any;
-    width?: number;
-    height?: number;
-    depth?: number;
-    glFormat?: any;
-    type?: any;
-    offset?: number;
-    data: any;
-    parameters?: Record<GL, any>;
-    compressed?: boolean;
-    x?: number;
-    y?: number;
-    /** @deprecated */
-    pixels?: any;
-};
-type SetImageData3DOptions = {
-    level?: number;
-    dataFormat?: any;
-    width?: number;
-    height?: number;
-    depth?: number;
-    format?: any;
-    type?: any;
-    offset?: number;
-    data: any;
-    parameters?: Record<GL, any>;
-};
-export declare class WEBGLTexture extends Texture<WEBGLTextureProps> {
-    static FACES: number[];
+export declare class WEBGLTexture extends Texture {
     readonly MAX_ATTRIBUTES: number;
     readonly device: WebGLDevice;
     readonly gl: WebGL2RenderingContext;
-    readonly handle: WebGLTexture;
+    handle: WebGLTexture;
     sampler: WEBGLSampler;
     view: WEBGLTextureView;
-    glFormat: GL;
-    type: GL;
-    dataFormat: GL;
     mipmaps: boolean;
     /**
      * @note `target` cannot be modified by bind:
      * textures are special because when you first bind them to a target,
-     * they get special information. When you first bind a texture as a
-     * GL_TEXTURE_2D, you are saying that this texture is a 2D texture.
+     * When you first bind a texture as a GL_TEXTURE_2D, you are saying that this texture is a 2D texture.
      * And it will always be a 2D texture; this state cannot be changed ever.
      * A texture that was first bound as a GL_TEXTURE_2D, must always be bound as a GL_TEXTURE_2D;
      * attempting to bind it as GL_TEXTURE_3D will give rise to a run-time error
-     * */
-    target: GL;
-    textureUnit: number;
-    /**
-     * Program.draw() checks the loaded flag of all textures to avoid
-     * Textures that are still loading from promises
-     * Set to true as soon as texture has been initialized with valid data
      */
-    loaded: boolean;
+    glTarget: GLTextureTarget;
+    /** The WebGL format - essentially channel structure */
+    glFormat: GLTexelDataFormat;
+    /** The WebGL data format - the type of each channel */
+    glType: GLPixelType;
+    /** The WebGL constant corresponding to the WebGPU style constant in format */
+    glInternalFormat: GL;
+    /** Whether the internal format is compressed */
+    compressed: boolean;
+    /** Texture binding slot */
+    textureUnit: number;
+    /** For automatically updating video */
     _video: {
         video: HTMLVideoElement;
         parameters: any;
         lastTime: number;
-    };
-    constructor(device: Device, props: WEBGLTextureProps);
+    } | null;
+    constructor(device: Device, props: TextureProps);
+    /**
+     * Initialize texture with supplied props
+     */
+    initialize(props?: TextureProps): void;
     destroy(): void;
     toString(): string;
     createView(props: TextureViewProps): WEBGLTextureView;
-    initialize(props?: WEBGLTextureProps): this;
-    initializeCube(props?: WEBGLTextureProps): this;
-    setSampler(sampler?: Sampler | SamplerProps): this;
+    setSampler(sampler?: Sampler | SamplerProps): void;
+    /** Update external texture (video frame or canvas) */
+    update(): void;
+    generateMipmap(params?: {}): void;
+    setTexture1DData(data: Texture1DData): void;
+    /** Set a simple texture */
+    setTexture2DData(lodData: Texture2DData, depth?: number, glTarget?: GLTextureTarget): void;
     /**
-     * If size has changed, reinitializes with current format
-     * @note note clears image and mipmaps
+     * Sets a 3D texture
+     * @param data
      */
-    resize(options: {
-        height: number;
-        width: number;
-        mipmaps?: boolean;
-    }): this;
-    /** Update external texture (video frame) */
-    update(): void;
-    generateMipmap(params?: {}): this;
-    setImageData(options: SetImageDataOptions): this;
+    setTexture3DData(data: Texture3DData): void;
     /**
-     * Redefines an area of an existing texture
-     * Note: does not allocate storage
-     * Redefines an area of an existing texture
+     * Set a Texture Cube Data
+     * @todo - could support TextureCubeArray with depth
+     * @param data
+     * @param index
      */
-    setSubImageData({ target, pixels, data, x, y, width, height, level, glFormat, type, dataFormat, compressed, offset, parameters }: SetSubImageDataOptions): void;
+    setTextureCubeData(data: TextureCubeData, depth?: number): void;
     /**
-     * Defines a two-dimensional texture image or cube-map texture image with
-     * pixels from the current framebuffer (rather than from client memory).
-     * (gl.copyTexImage2D wrapper)
-     *
-     * Note that binding a texture into a Framebuffer's color buffer and
-     * rendering can be faster.
+     * Sets an entire texture array
+     * @param data
      */
-    copyFramebuffer(opts?: {}): any;
-    getActiveUnit(): number;
-    bind(textureUnit?: number): number;
-    unbind(textureUnit?: number): number;
-    _getDataType({ data, compressed }: {
-        data: any;
-        compressed?: boolean;
-    }): {
-        data: any;
-        dataType: string;
-    };
-    _deduceParameters(opts: WEBGLTextureProps): {
-        dataFormat: number;
-        type: number;
-        compressed: boolean;
-        width: number;
-        height: number;
-        format: import("@luma.gl/core").TextureFormat;
-        data: string | import("@luma.gl/core").TextureData | Promise<import("@luma.gl/core").TextureData> | import("modules/core/dist/adapter/resources/texture").CubeTextureData | HTMLVideoElement;
-    };
-    _deduceImageSize(data: any, width: any, height: any): {
-        width: number;
-        height: number;
-    };
-    setCubeMapImageData(options: {
-        width: any;
-        height: any;
-        pixels: any;
-        data: any;
-        format?: any;
-        type?: any;
-    }): Promise<void>;
+    setTextureArrayData(data: TextureArrayData): void;
+    /**
+     * Sets an entire texture cube array
+     * @param data
+     */
+    setTextureCubeArrayData(data: TextureCubeArrayData): void;
+    setTextureCubeFaceData(lodData: Texture2DData, face: TextureCubeFace, depth?: number): void;
     /** @todo update this method to accept LODs */
-    setImageDataForFace(options: any): this;
-    /** Image 3D copies from Typed Array or WebGLBuffer */
-    setImageData3D(options: SetImageData3DOptions): this;
+    setImageDataForFace(options: any): void;
+    _getImageDataMap(faceData: Record<string | GL, any>): Record<GL, any>;
     /**
      * Sets sampler parameters on texture
      */
     _setSamplerParameters(parameters: GLSamplerParameters): void;
+    /**
+     * Copy a region of data from a CPU memory buffer into this texture.
+     * @todo -   GLUnpackParameters parameters
+     */
+    protected _setMipLevel(depth: number, level: number, textureData: Texture2DData, offset?: number): void;
+    getActiveUnit(): number;
+    bind(textureUnit?: number): number;
+    unbind(textureUnit?: number): number | undefined;
 }
-export {};
 //# sourceMappingURL=webgl-texture.d.ts.map