@luma.gl/webgl 9.0.4 → 9.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/webgl",
-  "version": "9.0.4",
+  "version": "9.0.6",
   "description": "WebGL2 adapter for the luma.gl core API",
   "type": "module",
   "license": "MIT",
@@ -43,8 +43,8 @@
     "@luma.gl/core": "^9.0.0"
   },
   "dependencies": {
-    "@luma.gl/constants": "9.0.4",
+    "@luma.gl/constants": "9.0.6",
     "@probe.gl/env": "^4.0.2"
   },
-  "gitHead": "d8d47a36bd014fc4848043082bdff31604f6b5c1"
+  "gitHead": "937f4cffd47819854b44ce1532add35f6a8d049c"
 }

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

@@ -16,6 +16,7 @@ const GL_STENCIL_BUFFER_BIT = 0x00000400;
 const GL_COLOR_BUFFER_BIT = 0x00004000;
 
 const GL_COLOR = 0x1800;
+const COLOR_CHANNELS = [0x1, 0x2, 0x4, 0x8]; // GPUColorWrite RED, GREEN, BLUE, ALPHA
 
 export class WEBGLRenderPass extends RenderPass {
   readonly device: WebGLDevice;
@@ -82,8 +83,8 @@ export class WEBGLRenderPass extends RenderPass {
         glParameters.viewport = parameters.viewport;
       }
     }
-    glParameters.scissorTest = Boolean(parameters.scissorRect);
     if (parameters.scissorRect) {
+      glParameters.scissorTest = true;
       glParameters.scissor = parameters.scissorRect;
     }
     if (parameters.blendConstant) {
@@ -97,6 +98,12 @@ export class WEBGLRenderPass extends RenderPass {
       parameters[GL.STENCIL_REF] = parameters.stencilReference;
     }
 
+    if (parameters.colorMask) {
+      glParameters.colorMask = COLOR_CHANNELS.map(channel =>
+        Boolean(channel & parameters.colorMask)
+      );
+    }
+
     this.glParameters = glParameters;
 
     setGLParameters(this.device.gl, glParameters);

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

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {UniformValue, RenderPipelineProps, Binding} from '@luma.gl/core';
-import type {ShaderLayout} from '@luma.gl/core';
+import type {RenderPipelineProps, RenderPipelineParameters, PrimitiveTopology} from '@luma.gl/core';
+import type {ShaderLayout, UniformValue, Binding} from '@luma.gl/core';
 import type {RenderPass, VertexArray} from '@luma.gl/core';
 import {RenderPipeline, cast, splitUniformsAndBindings, log} from '@luma.gl/core';
 import {mergeShaderLayout} from '@luma.gl/core';
@@ -166,7 +166,8 @@ export class WEBGLRenderPipeline extends RenderPipeline {
    */
   draw(options: {
     renderPass: RenderPass;
-    /** vertex attributes */
+    parameters?: RenderPipelineParameters;
+    topology?: PrimitiveTopology;
     vertexArray: VertexArray;
     vertexCount?: number;
     indexCount?: number;
@@ -179,6 +180,8 @@ export class WEBGLRenderPipeline extends RenderPipeline {
   }): boolean {
     const {
       renderPass,
+      parameters = this.props.parameters,
+      topology = this.props.topology,
       vertexArray,
       vertexCount,
       // indexCount,
@@ -190,7 +193,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
       transformFeedback
     } = options;
 
-    const glDrawMode = getGLDrawMode(this.props.topology);
+    const glDrawMode = getGLDrawMode(topology);
     const isIndexed: boolean = Boolean(vertexArray.indexBuffer);
     const glIndexType = (vertexArray.indexBuffer as WEBGLBuffer)?.glIndexType;
     const isInstanced: boolean = Number(instanceCount) > 0;
@@ -231,39 +234,34 @@ export class WEBGLRenderPipeline extends RenderPipeline {
 
     const webglRenderPass = renderPass as WEBGLRenderPass;
 
-    withDeviceAndGLParameters(
-      this.device,
-      this.props.parameters,
-      webglRenderPass.glParameters,
-      () => {
-        if (isIndexed && isInstanced) {
-          this.device.gl.drawElementsInstanced(
-            glDrawMode,
-            vertexCount || 0, // indexCount?
-            glIndexType,
-            firstVertex,
-            instanceCount || 0
-          );
-          // } else if (isIndexed && this.device.isWebGL2 && !isNaN(start) && !isNaN(end)) {
-          //   this.device.gldrawRangeElements(glDrawMode, start, end, vertexCount, glIndexType, offset);
-        } else if (isIndexed) {
-          this.device.gl.drawElements(glDrawMode, vertexCount || 0, glIndexType, firstVertex); // indexCount?
-        } else if (isInstanced) {
-          this.device.gl.drawArraysInstanced(
-            glDrawMode,
-            firstVertex,
-            vertexCount || 0,
-            instanceCount || 0
-          );
-        } else {
-          this.device.gl.drawArrays(glDrawMode, firstVertex, vertexCount || 0);
-        }
+    withDeviceAndGLParameters(this.device, parameters, webglRenderPass.glParameters, () => {
+      if (isIndexed && isInstanced) {
+        this.device.gl.drawElementsInstanced(
+          glDrawMode,
+          vertexCount || 0, // indexCount?
+          glIndexType,
+          firstVertex,
+          instanceCount || 0
+        );
+        // } else if (isIndexed && this.device.isWebGL2 && !isNaN(start) && !isNaN(end)) {
+        //   this.device.gldrawRangeElements(glDrawMode, start, end, vertexCount, glIndexType, offset);
+      } else if (isIndexed) {
+        this.device.gl.drawElements(glDrawMode, vertexCount || 0, glIndexType, firstVertex); // indexCount?
+      } else if (isInstanced) {
+        this.device.gl.drawArraysInstanced(
+          glDrawMode,
+          firstVertex,
+          vertexCount || 0,
+          instanceCount || 0
+        );
+      } else {
+        this.device.gl.drawArrays(glDrawMode, firstVertex, vertexCount || 0);
+      }
 
-        if (transformFeedback) {
-          transformFeedback.end();
-        }
+      if (transformFeedback) {
+        transformFeedback.end();
       }
-    );
+    });
 
     vertexArray.unbindAfterRender(renderPass);
 

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

@@ -76,11 +76,11 @@ export class WEBGLShader extends Shader {
     // Sync case - slower, but advantage is that it throws in the constructor, making break on error more useful
     if (!this.device.features.has('compilation-status-async-webgl')) {
       this._getCompilationStatus();
+      // The `Shader` base class will determine if debug window should be opened based on this.compilationStatus
+      this.debugShader();
       if (this.compilationStatus === 'error') {
         throw new Error(`GLSL compilation errors in ${this.props.stage} shader ${this.props.id}`);
       }
-      // The `Shader` base class will determine if debug window should be opened based on this.compilationStatus
-      this.debugShader();
       return;
     }
 

package/src/adapter/webgl-device.ts

@@ -71,7 +71,11 @@ import {WEBGLTransformFeedback} from './resources/webgl-transform-feedback';
 import {WEBGLQuerySet} from './resources/webgl-query-set';
 
 import {readPixelsToArray, readPixelsToBuffer} from '../classic/copy-and-blit';
-import {setGLParameters, getGLParameters} from '../context/parameters/unified-parameter-api';
+import {
+  setGLParameters,
+  getGLParameters,
+  resetGLParameters
+} from '../context/parameters/unified-parameter-api';
 import {withGLParameters} from '../context/state-tracker/with-parameters';
 import {clear} from '../classic/clear';
 import {getWebGLExtension} from '../context/helpers/webgl-extensions';
@@ -408,7 +412,7 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
   }
 
   override withParametersWebGL(parameters: any, func: any): any {
-    withGLParameters(this.gl, parameters, func);
+    return withGLParameters(this.gl, parameters, func);
   }
 
   override clearWebGL(options?: {
@@ -420,6 +424,11 @@ ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContex
     clear(this, options);
   }
 
+  override resetWebGL(): void {
+    log.warn('WebGLDevice.resetWebGL is deprecated, use only for debugging')();
+    resetGLParameters(this.gl);
+  }
+
   //
   // WebGL-only API (not part of `Device` API)
   //