@luma.gl/webgl 9.0.9 → 9.0.11

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

@@ -43,6 +43,7 @@ export declare class WEBGLRenderPipeline extends RenderPipeline {
         parameters?: RenderPipelineParameters;
         topology?: PrimitiveTopology;
         vertexArray: VertexArray;
+        isInstanced?: boolean;
         vertexCount?: number;
         indexCount?: number;
         instanceCount?: 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,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"}
+{"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"}

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

@@ -130,7 +130,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
     draw(options) {
         const { renderPass, parameters = this.props.parameters, topology = this.props.topology, vertexArray, vertexCount, 
         // indexCount,
-        instanceCount, firstVertex = 0, 
+        instanceCount, isInstanced = false, firstVertex = 0, 
         // firstIndex,
         // firstInstance,
         // baseVertex,
@@ -138,7 +138,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
         const glDrawMode = getGLDrawMode(topology);
         const isIndexed = Boolean(vertexArray.indexBuffer);
         const glIndexType = vertexArray.indexBuffer?.glIndexType;
-        const isInstanced = Number(instanceCount) > 0;
+        // Note that we sometimes get called with 0 instances
         // If we are using async linking, we need to wait until linking completes
         if (this.linkStatus !== 'success') {
             log.info(2, `RenderPipeline:${this.id}.draw() aborted - waiting for shader linking`)();
@@ -237,7 +237,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
                     throw new Error(`Error during compilation of shader ${this.vs.id}`);
                 }
                 if (this.fs?.compilationStatus === 'error') {
-                    this.vs.debugShader();
+                    this.fs.debugShader();
                     throw new Error(`Error during compilation of shader ${this.fs.id}`);
                 }
                 throw new Error(`Error during ${status}: ${this.device.gl.getProgramInfoLog(this.handle)}`);

package/dist/dist.dev.js

@@ -3715,35 +3715,38 @@ 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" && window.process?.type === "renderer") {
+    if (typeof window !== "undefined" && typeof window.process === "object" && window.process.type === "renderer") {
       return true;
     }
-    if (typeof process !== "undefined" && Boolean(process.versions?.["electron"])) {
+    if (typeof process !== "undefined" && typeof process.versions === "object" && Boolean(process.versions["electron"])) {
       return true;
     }
-    const realUserAgent = typeof navigator !== "undefined" && navigator.userAgent;
+    const realUserAgent = typeof navigator === "object" && typeof navigator.userAgent === "string" && navigator.userAgent;
     const userAgent = mockUserAgent || realUserAgent;
-    return Boolean(userAgent && userAgent.indexOf("Electron") >= 0);
+    if (userAgent && userAgent.indexOf("Electron") >= 0) {
+      return true;
+    }
+    return false;
   }
 
   // ../../node_modules/@probe.gl/env/dist/lib/is-browser.js
   function isBrowser() {
-    const isNode = (
-      // @ts-expect-error
-      typeof process === "object" && String(process) === "[object process]" && !process?.browser
-    );
+    const isNode = 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,13 +3758,18 @@ var __exports__ = (() => {
     if (userAgent.indexOf("Edge") > -1) {
       return "Edge";
     }
-    if (globalThis.chrome) {
+    const isMSIE = userAgent.indexOf("MSIE ") !== -1;
+    const isTrident = userAgent.indexOf("Trident/") !== -1;
+    if (isMSIE || isTrident) {
+      return "IE";
+    }
+    if (window2.chrome) {
       return "Chrome";
     }
-    if (globalThis.safari) {
+    if (window2.safari) {
       return "Safari";
     }
-    if (globalThis.mozInnerScreenX) {
+    if (window2.mozInnerScreenX) {
       return "Firefox";
     }
     return "Unknown";
@@ -4856,6 +4864,7 @@ ${source2}`;
         vertexCount,
         // indexCount,
         instanceCount,
+        isInstanced = false,
         firstVertex = 0,
         // firstIndex,
         // firstInstance,
@@ -4865,7 +4874,6 @@ ${source2}`;
       const glDrawMode = getGLDrawMode(topology);
       const isIndexed = Boolean(vertexArray.indexBuffer);
       const glIndexType = vertexArray.indexBuffer?.glIndexType;
-      const isInstanced = Number(instanceCount) > 0;
       if (this.linkStatus !== "success") {
         import_core17.log.info(2, `RenderPipeline:${this.id}.draw() aborted - waiting for shader linking`)();
         return false;
@@ -4961,7 +4969,7 @@ ${source2}`;
             throw new Error(`Error during compilation of shader ${this.vs.id}`);
           }
           if (this.fs?.compilationStatus === "error") {
-            this.vs.debugShader();
+            this.fs.debugShader();
             throw new Error(`Error during compilation of shader ${this.fs.id}`);
           }
           throw new Error(`Error during ${status}: ${this.device.gl.getProgramInfoLog(this.handle)}`);