@luma.gl/webgl 9.0.5 → 9.0.6

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;AAapD,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;IAQX,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;IA+C1D,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,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;IAQX,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"}

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

@@ -11,6 +11,7 @@ const GL_DEPTH_BUFFER_BIT = 0x00000100;
 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 {
     device;
     /** Parameters that should be applied before each draw call */
@@ -77,6 +78,9 @@ export class WEBGLRenderPass extends RenderPass {
             // Does this work?
             parameters[2967] = parameters.stencilReference;
         }
+        if (parameters.colorMask) {
+            glParameters.colorMask = COLOR_CHANNELS.map(channel => Boolean(channel & parameters.colorMask));
+        }
         this.glParameters = glParameters;
         setGLParameters(this.device.gl, glParameters);
     }

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

@@ -1,5 +1,5 @@
-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 } from '@luma.gl/core';
 import { WebGLDevice } from "../webgl-device.js";
@@ -40,7 +40,8 @@ export declare class WEBGLRenderPipeline extends RenderPipeline {
      */
     draw(options: {
         renderPass: RenderPass;
-        /** vertex attributes */
+        parameters?: RenderPipelineParameters;
+        topology?: PrimitiveTopology;
         vertexArray: VertexArray;
         vertexCount?: number;
         indexCount?: number;

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,YAAY,EAAE,mBAAmB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC9E,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,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,wBAAwB;QACxB,WAAW,EAAE,WAAW,CAAC;QACzB,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;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,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,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;IA6FF,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"}

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

@@ -128,14 +128,14 @@ export class WEBGLRenderPipeline extends RenderPipeline {
      * This function unifies those ways into a single call using common parameters with sane defaults
      */
     draw(options) {
-        const { renderPass, vertexArray, vertexCount, 
+        const { renderPass, parameters = this.props.parameters, topology = this.props.topology, vertexArray, vertexCount, 
         // indexCount,
         instanceCount, firstVertex = 0, 
         // firstIndex,
         // firstInstance,
         // baseVertex,
         transformFeedback } = options;
-        const glDrawMode = getGLDrawMode(this.props.topology);
+        const glDrawMode = getGLDrawMode(topology);
         const isIndexed = Boolean(vertexArray.indexBuffer);
         const glIndexType = vertexArray.indexBuffer?.glIndexType;
         const isInstanced = Number(instanceCount) > 0;
@@ -167,7 +167,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
         this._applyBindings();
         this._applyUniforms();
         const webglRenderPass = renderPass;
-        withDeviceAndGLParameters(this.device, this.props.parameters, webglRenderPass.glParameters, () => {
+        withDeviceAndGLParameters(this.device, parameters, webglRenderPass.glParameters, () => {
             if (isIndexed && isInstanced) {
                 this.device.gl.drawElementsInstanced(glDrawMode, vertexCount || 0, // indexCount?
                 glIndexType, firstVertex, instanceCount || 0);

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

@@ -62,11 +62,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;
         }
         // async case

package/dist/dist.dev.js

@@ -3712,38 +3712,35 @@ var __exports__ = (() => {
   // src/context/debug/webgl-developer-tools.ts
   var import_core13 = __toESM(require_core(), 1);
 
+  // ../../node_modules/@probe.gl/env/dist/lib/globals.js
+  var document_ = globalThis.document || {};
+  var process_ = globalThis.process || {};
+  var console_ = globalThis.console;
+  var navigator_ = globalThis.navigator || {};
+
   // ../../node_modules/@probe.gl/env/dist/lib/is-electron.js
   function isElectron(mockUserAgent) {
-    if (typeof window !== "undefined" && typeof window.process === "object" && window.process.type === "renderer") {
+    if (typeof window !== "undefined" && window.process?.type === "renderer") {
       return true;
     }
-    if (typeof process !== "undefined" && typeof process.versions === "object" && Boolean(process.versions["electron"])) {
+    if (typeof process !== "undefined" && Boolean(process.versions?.["electron"])) {
       return true;
     }
-    const realUserAgent = typeof navigator === "object" && typeof navigator.userAgent === "string" && navigator.userAgent;
+    const realUserAgent = typeof navigator !== "undefined" && navigator.userAgent;
     const userAgent = mockUserAgent || realUserAgent;
-    if (userAgent && userAgent.indexOf("Electron") >= 0) {
-      return true;
-    }
-    return false;
+    return Boolean(userAgent && userAgent.indexOf("Electron") >= 0);
   }
 
   // ../../node_modules/@probe.gl/env/dist/lib/is-browser.js
   function isBrowser() {
-    const isNode = typeof process === "object" && String(process) === "[object process]" && !process.browser;
+    const isNode = (
+      // @ts-expect-error
+      typeof process === "object" && String(process) === "[object process]" && !process?.browser
+    );
     return !isNode || isElectron();
   }
 
-  // ../../node_modules/@probe.gl/env/dist/lib/globals.js
-  var self_ = globalThis.self || globalThis.window || globalThis.global;
-  var window_ = globalThis.window || globalThis.self || globalThis.global;
-  var document_ = globalThis.document || {};
-  var process_ = globalThis.process || {};
-  var console_ = globalThis.console;
-  var navigator_ = globalThis.navigator || {};
-
   // ../../node_modules/@probe.gl/env/dist/lib/get-browser.js
-  var window2 = globalThis;
   function getBrowser(mockUserAgent) {
     if (!mockUserAgent && !isBrowser()) {
       return "Node";
@@ -3755,18 +3752,13 @@ var __exports__ = (() => {
     if (userAgent.indexOf("Edge") > -1) {
       return "Edge";
     }
-    const isMSIE = userAgent.indexOf("MSIE ") !== -1;
-    const isTrident = userAgent.indexOf("Trident/") !== -1;
-    if (isMSIE || isTrident) {
-      return "IE";
-    }
-    if (window2.chrome) {
+    if (globalThis.chrome) {
       return "Chrome";
     }
-    if (window2.safari) {
+    if (globalThis.safari) {
       return "Safari";
     }
-    if (window2.mozInnerScreenX) {
+    if (globalThis.mozInnerScreenX) {
       return "Firefox";
     }
     return "Unknown";
@@ -3971,10 +3963,10 @@ ${source2}`;
       }
       if (!this.device.features.has("compilation-status-async-webgl")) {
         this._getCompilationStatus();
+        this.debugShader();
         if (this.compilationStatus === "error") {
           throw new Error(`GLSL compilation errors in ${this.props.stage} shader ${this.props.id}`);
         }
-        this.debugShader();
         return;
       }
       import_core14.log.once(1, "Shader compilation is asynchronous")();
@@ -4016,6 +4008,7 @@ ${source2}`;
   var GL_STENCIL_BUFFER_BIT = 1024;
   var GL_COLOR_BUFFER_BIT = 16384;
   var GL_COLOR = 6144;
+  var COLOR_CHANNELS = [1, 2, 4, 8];
   var WEBGLRenderPass = class extends import_core15.RenderPass {
     device;
     /** Parameters that should be applied before each draw call */
@@ -4074,6 +4067,11 @@ ${source2}`;
         console.warn("RenderPassParameters.stencilReference not yet implemented in WebGL");
         parameters[2967 /* 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);
     }
@@ -4852,6 +4850,8 @@ ${source2}`;
     draw(options) {
       const {
         renderPass,
+        parameters = this.props.parameters,
+        topology = this.props.topology,
         vertexArray,
         vertexCount,
         // indexCount,
@@ -4862,7 +4862,7 @@ ${source2}`;
         // baseVertex,
         transformFeedback
       } = options;
-      const glDrawMode = getGLDrawMode(this.props.topology);
+      const glDrawMode = getGLDrawMode(topology);
       const isIndexed = Boolean(vertexArray.indexBuffer);
       const glIndexType = vertexArray.indexBuffer?.glIndexType;
       const isInstanced = Number(instanceCount) > 0;
@@ -4886,37 +4886,32 @@ ${source2}`;
       this._applyBindings();
       this._applyUniforms();
       const webglRenderPass = renderPass;
-      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.gl.drawElements(glDrawMode, vertexCount || 0, glIndexType, firstVertex);
-          } 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();
-          }
+      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.gl.drawElements(glDrawMode, vertexCount || 0, glIndexType, firstVertex);
+        } 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();
+        }
+      });
       vertexArray.unbindAfterRender(renderPass);
       return true;
     }