@luma.gl/webgl 9.1.0-alpha.12 → 9.1.0-alpha.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/webgl",
-  "version": "9.1.0-alpha.12",
+  "version": "9.1.0-alpha.14",
   "description": "WebGL2 adapter for the luma.gl core API",
   "type": "module",
   "license": "MIT",
@@ -43,9 +43,9 @@
     "@luma.gl/core": "9.1.0-alpha.10"
   },
   "dependencies": {
-    "@luma.gl/constants": "9.1.0-alpha.12",
+    "@luma.gl/constants": "9.1.0-alpha.14",
     "@math.gl/types": "4.1.0-alpha.3",
     "@probe.gl/env": "^4.0.8"
   },
-  "gitHead": "61b0080d5beb5284b8bdcec5cf59e13cda65295a"
+  "gitHead": "e6e014efa323dbcd7d3774e982e442b1bf2c93be"
 }

package/src/adapter/resources/webgl-framebuffer.ts

@@ -39,39 +39,7 @@ export class WEBGLFramebuffer extends Framebuffer {
       // Auto create textures for attachments if needed
       this.autoCreateAttachmentTextures();
 
-      /** Attach from a map of attachments */
-      // @ts-expect-error native bindFramebuffer is overridden by our state tracker
-      const prevHandle: WebGLFramebuffer | null = this.gl.bindFramebuffer(
-        GL.FRAMEBUFFER,
-        this.handle
-      );
-
-      // Walk the attachments
-      for (let i = 0; i < this.colorAttachments.length; ++i) {
-        const attachment = this.colorAttachments[i];
-        const attachmentPoint = GL.COLOR_ATTACHMENT0 + i;
-        if (attachment) {
-          this._attachTexture(attachmentPoint, attachment);
-        }
-      }
-
-      if (this.depthStencilAttachment) {
-        this._attachTexture(
-          getDepthStencilAttachmentWebGL(this.depthStencilAttachment.props.format),
-          this.depthStencilAttachment
-        );
-      }
-
-      /** Check the status */
-      // @ts-expect-error
-      if (props.check !== false) {
-        const status = this.gl.checkFramebufferStatus(GL.FRAMEBUFFER) as GL;
-        if (status !== GL.FRAMEBUFFER_COMPLETE) {
-          throw new Error(`Framebuffer ${_getFrameBufferStatus(status)}`);
-        }
-      }
-
-      this.gl.bindFramebuffer(GL.FRAMEBUFFER, prevHandle);
+      this.updateAttachments();
     }
   }
 
@@ -84,6 +52,42 @@ export class WEBGLFramebuffer extends Framebuffer {
     }
   }
 
+  protected updateAttachments(): void {
+    /** Attach from a map of attachments */
+    // @ts-expect-error native bindFramebuffer is overridden by our state tracker
+    const prevHandle: WebGLFramebuffer | null = this.gl.bindFramebuffer(
+      GL.FRAMEBUFFER,
+      this.handle
+    );
+
+    // Walk the attachments
+    for (let i = 0; i < this.colorAttachments.length; ++i) {
+      const attachment = this.colorAttachments[i];
+      if (attachment) {
+        const attachmentPoint = GL.COLOR_ATTACHMENT0 + i;
+        this._attachTextureView(attachmentPoint, attachment);
+      }
+    }
+
+    if (this.depthStencilAttachment) {
+      const attachmentPoint = getDepthStencilAttachmentWebGL(
+        this.depthStencilAttachment.props.format
+      );
+      this._attachTextureView(attachmentPoint, this.depthStencilAttachment);
+    }
+
+    /** Check the status */
+    // @ts-expect-error
+    if (this.props.check !== false) {
+      const status = this.gl.checkFramebufferStatus(GL.FRAMEBUFFER) as GL;
+      if (status !== GL.FRAMEBUFFER_COMPLETE) {
+        throw new Error(`Framebuffer ${_getFrameBufferStatus(status)}`);
+      }
+    }
+
+    this.gl.bindFramebuffer(GL.FRAMEBUFFER, prevHandle);
+  }
+
   // PRIVATE
 
   /** In WebGL we must use renderbuffers for depth/stencil attachments (unless we have extensions) */
@@ -98,46 +102,6 @@ export class WEBGLFramebuffer extends Framebuffer {
     });
   }
 
-  /**
-   * Attachment resize is expected to be a noop if size is same
-   *
-  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 */
-  protected _attachTexture(attachmentPoint: GL, textureView: WEBGLTextureView): void {
-    // if (attachment instanceof WEBGLRenderbuffer) {
-    //   this._attachWEBGLRenderbuffer(attachmentPoint, attachment);
-    //   return attachment;
-    // }
-    this._attachTextureView(attachmentPoint, textureView);
-  }
-
   /**
    * @param attachment
    * @param texture
@@ -210,3 +174,34 @@ function _getFrameBufferStatus(status: GL) {
       return `${status}`;
   }
 }
+
+/**
+ * Attachment resize is expected to be a noop if size is same
+ *
+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;
+}
+*/

package/src/adapter/resources/webgl-texture.ts

@@ -143,6 +143,8 @@ export class WEBGLTexture extends Texture {
   } | null = null;
 
   constructor(device: Device, props: TextureProps) {
+    props = Texture._fixProps(props);
+
     // Note: Clear out `props.data` so that we don't hold a reference to any big memory chunks
     super(device, {...Texture.defaultProps, ...props, data: undefined!});
 

package/src/adapter/webgl-device.ts

@@ -216,8 +216,7 @@ export class WebGLDevice extends Device {
     return new WEBGLBuffer(this, newProps);
   }
 
-  // _createTexture(props: TextureProps): WEBGLTexture {
-  _createTexture(props: TextureProps): Texture {
+  createTexture(props: TextureProps): WEBGLTexture {
     return new WEBGLTexture(this, props);
   }