@luma.gl/webgl 9.0.0-beta.9 → 9.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/webgl",
-  "version": "9.0.0-beta.9",
+  "version": "9.0.3",
   "description": "WebGL2 adapter for the luma.gl core API",
   "type": "module",
   "license": "MIT",
@@ -40,11 +40,11 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "^9.0.0-beta"
+    "@luma.gl/core": "^9.0.0"
   },
   "dependencies": {
-    "@luma.gl/constants": "9.0.0-beta.9",
+    "@luma.gl/constants": "9.0.3",
     "@probe.gl/env": "^4.0.2"
   },
-  "gitHead": "6a91ba24a0f78ef190c51e52c31271ea1a5a7a1f"
+  "gitHead": "543e03b2d4bd865ac86cc8927611b91cc3e0393c"
 }

package/src/adapter/device-helpers/webgl-device-features.ts

@@ -61,12 +61,8 @@ export class WebGLDeviceFeatures extends DeviceFeatures {
   }
 
   *[Symbol.iterator](): IterableIterator<DeviceFeature> {
-    for (const feature of Object.keys(WEBGL_FEATURES) as DeviceFeature[]) {
-      if (this.has(feature)) {
-        yield feature;
-      }
-    }
-    for (const feature of Object.keys(TEXTURE_FEATURES) as DeviceFeature[]) {
+    const features = this.getFeatures();
+    for (const feature of features) {
       if (this.has(feature)) {
         yield feature;
       }
@@ -98,15 +94,20 @@ export class WebGLDeviceFeatures extends DeviceFeatures {
   // FOR DEVICE
 
   initializeFeatures() {
-    // @ts-expect-error
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    for (const feature of this) {
-      // WebGL extensions are initialized by requesting them
+    // Initialize all features by checking them.
+    // Except WEBGL_polygon_mode since Chrome logs ugly console warnings
+    const features = this.getFeatures().filter(feature => feature !== 'polygon-mode-webgl');
+    for (const feature of features) {
+      this.has(feature);
     }
   }
 
   // IMPLEMENTATION
 
+  getFeatures() {
+    return [...Object.keys(WEBGL_FEATURES), ...Object.keys(TEXTURE_FEATURES)] as DeviceFeature[];
+  }
+
   /** Extract all WebGL features */
   protected getWebGLFeature(feature: DeviceFeature): boolean {
     const featureInfo = WEBGL_FEATURES[feature];

package/src/adapter/resources/webgl-render-pipeline.ts

@@ -72,9 +72,9 @@ export class WEBGLRenderPipeline extends RenderPipeline {
 
     this._linkShaders();
 
-    log.time(0, `RenderPipeline ${this.id} - shaderLayout introspection`)();
+    log.time(1, `RenderPipeline ${this.id} - shaderLayout introspection`)();
     this.introspectedLayout = getShaderLayout(this.device.gl, this.handle);
-    log.timeEnd(0, `RenderPipeline ${this.id} - shaderLayout introspection`)();
+    log.timeEnd(1, `RenderPipeline ${this.id} - shaderLayout introspection`)();
 
     // Merge provided layout with introspected layout
     this.shaderLayout = mergeShaderLayout(this.introspectedLayout, props.shaderLayout);
@@ -103,7 +103,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
    * Bindings include: textures, samplers and uniform buffers
    * @todo needed for portable model
    */
-  setBindings(bindings: Record<string, Binding>): void {
+  setBindings(bindings: Record<string, Binding>, options?: {disableWarnings?: boolean}): void {
     // if (log.priority >= 2) {
     //   checkUniformValues(uniforms, this.id, this._uniformSetters);
     // }
@@ -121,9 +121,11 @@ export class WEBGLRenderPipeline extends RenderPipeline {
         const validBindings = this.shaderLayout.bindings
           .map(binding => `"${binding.name}"`)
           .join(', ');
-        log.warn(
-          `Unknown binding "${name}" in render pipeline "${this.id}", expected one of ${validBindings}`
-        )();
+        if (options?.disableWarnings) {
+          log.warn(
+            `Unknown binding "${name}" in render pipeline "${this.id}", expected one of ${validBindings}`
+          )();
+        }
         continue; // eslint-disable-line no-continue
       }
       if (!value) {
@@ -461,12 +463,12 @@ export class WEBGLRenderPipeline extends RenderPipeline {
             texture = value;
           } else if (
             value instanceof WEBGLFramebuffer &&
-            value.colorAttachments[0] instanceof WEBGLTexture
+            value.colorAttachments[0] instanceof WEBGLTextureView
           ) {
             log.warn(
               'Passing framebuffer in texture binding may be deprecated. Use fbo.colorAttachments[0] instead'
             )();
-            texture = value.colorAttachments[0];
+            texture = value.colorAttachments[0].texture;
           } else {
             throw new Error('No texture');
           }

package/src/adapter/resources/webgl-vertex-array.ts

@@ -57,8 +57,8 @@ export class WEBGLVertexArray extends VertexArray {
   /**
   // Set (bind/unbind) an elements buffer, for indexed rendering.
   // Must be a Buffer bound to GL.ELEMENT_ARRAY_BUFFER or null. Constants not supported
-   * 
-   * @param elementBuffer 
+   *
+   * @param elementBuffer
    */
   setIndexBuffer(indexBuffer: Buffer | null): void {
     const buffer = indexBuffer as WEBGLBuffer;
@@ -68,12 +68,12 @@ export class WEBGLVertexArray extends VertexArray {
     }
     // In WebGL The GL.ELEMENT_ARRAY_BUFFER_BINDING is stored on the VertexArrayObject
     this.device.gl.bindVertexArray(this.handle);
-    // TODO - this initial binding does not seem to take effect? see bindBeforeRender()
     this.device.gl.bindBuffer(GL.ELEMENT_ARRAY_BUFFER, buffer ? buffer.handle : null);
-    // log.log(1, 'VertexArray.setIndexBuffer', indexBuffer)();
-    // log.log(1, `Binding vertex array ${this.id}`, buffer?.id)();
 
     this.indexBuffer = buffer;
+
+    // Unbind to prevent unintended changes to the VAO.
+    this.device.gl.bindVertexArray(null);
   }
 
   /** Set a location in vertex attributes array to a buffer, enables the location, sets divisor */
@@ -104,6 +104,9 @@ export class WEBGLVertexArray extends VertexArray {
     this.device.gl.vertexAttribDivisor(location, divisor || 0);
 
     this.attributes[location] = buffer;
+
+    // Unbind to prevent unintended changes to the VAO.
+    this.device.gl.bindVertexArray(null);
   }
 
   /** Set a location in vertex attributes array to a constant value, disables the location */
@@ -112,26 +115,14 @@ export class WEBGLVertexArray extends VertexArray {
     this.attributes[location] = value;
   }
 
-  init = false;
-
   override bindBeforeRender(): void {
     this.device.gl.bindVertexArray(this.handle);
-    // TODO - the initial bind does not seem to take effect.
-    if (!this.init) {
-      // log.log(1, `Binding vertex array ${this.id}`, this.indexBuffer?.id)();
-      const webglBuffer = this.indexBuffer as WEBGLBuffer;
-      this.device.gl.bindBuffer(GL.ELEMENT_ARRAY_BUFFER, webglBuffer?.handle || null);
-      this.init = true;
-    }
     this._applyConstantAttributes();
   }
 
   override unbindAfterRender(): void {
-    // log.log(1, `Unbinding vertex array ${this.id}`)();
-    // TODO technically this is not necessary, but we might be interfacing
-    // with code that does not use vertex array objects
+    // Unbind to prevent unintended changes to the VAO.
     this.device.gl.bindVertexArray(null);
-    // this.device.gl.bindBuffer(GL.ELEMENT_ARRAY_BUFFER, null);
   }
 
   // Internal methods