@luma.gl/webgl 9.3.0-alpha.2 → 9.3.0-alpha.4

package/dist/dist.dev.js

@@ -847,6 +847,24 @@ var __exports__ = (() => {
     }
   });
 
+  // src/context/helpers/webgl-context-data.ts
+  function getWebGLContextData(gl) {
+    const contextData = gl.luma || {
+      _polyfilled: false,
+      extensions: {},
+      softwareRenderer: false
+    };
+    contextData._polyfilled ??= false;
+    contextData.extensions ||= {};
+    gl.luma = contextData;
+    return contextData;
+  }
+  var init_webgl_context_data = __esm({
+    "src/context/helpers/webgl-context-data.ts"() {
+      "use strict";
+    }
+  });
+
   // src/context/debug/spector.ts
   async function loadSpectorJS(props) {
     if (!globalThis.SPECTOR) {
@@ -888,9 +906,10 @@ var __exports__ = (() => {
     }
     if (props.gl) {
       const gl = props.gl;
-      const device = gl.device;
+      const contextData = getWebGLContextData(gl);
+      const device = contextData.device;
       spector?.startCapture(props.gl, 500);
-      gl.device = device;
+      contextData.device = device;
       new Promise((resolve) => setTimeout(resolve, 2e3)).then((_) => {
         import_core.log.info("Spector capture stopped after 2 seconds")();
         spector?.stopCapture();
@@ -904,6 +923,7 @@ var __exports__ = (() => {
       "use strict";
       import_core = __toESM(require_core(), 1);
       init_load_script();
+      init_webgl_context_data();
       LOG_LEVEL = 1;
       spector = null;
       initialized = false;
@@ -1000,7 +1020,7 @@ var __exports__ = (() => {
   });
 
   // src/context/debug/webgl-developer-tools.ts
-  function getWebGLContextData(gl) {
+  function getWebGLContextData2(gl) {
     gl.luma = gl.luma || {};
     return gl.luma;
   }
@@ -1015,7 +1035,7 @@ var __exports__ = (() => {
     return props.debugWebGL || props.traceWebGL ? getDebugContext(gl, props) : getRealContext(gl);
   }
   function getRealContext(gl) {
-    const data = getWebGLContextData(gl);
+    const data = getWebGLContextData2(gl);
     return data.realContext ? data.realContext : gl;
   }
   function getDebugContext(gl, props) {
@@ -1023,7 +1043,7 @@ var __exports__ = (() => {
       import_core2.log.warn("webgl-debug not loaded")();
       return gl;
     }
-    const data = getWebGLContextData(gl);
+    const data = getWebGLContextData2(gl);
     if (data.debugContext) {
       return data.debugContext;
     }
@@ -1045,6 +1065,7 @@ var __exports__ = (() => {
     const debugContext = Object.create(WebGLDebugContext);
     data.realContext = gl;
     data.debugContext = debugContext;
+    debugContext.luma = data;
     debugContext.debug = true;
     return debugContext;
   }
@@ -1629,7 +1650,7 @@ var __exports__ = (() => {
         }
       }
     }
-    const cache = gl.state && gl.state.cache;
+    const cache = gl.lumaState?.cache;
     if (cache) {
       for (const key in compositeSetters) {
         const compositeSetter = GL_COMPOSITE_PARAMETER_SETTERS[key];
@@ -1752,7 +1773,7 @@ var __exports__ = (() => {
       init_webgl_parameter_tables();
       WebGLStateTracker = class {
         static get(gl) {
-          return gl.state;
+          return gl.lumaState;
         }
         gl;
         program = null;
@@ -1790,7 +1811,7 @@ var __exports__ = (() => {
             throw new Error("WebGLStateTracker");
           }
           this.initialized = true;
-          this.gl.state = this;
+          this.gl.lumaState = this;
           installProgramSpy(gl);
           for (const key in GL_HOOKED_SETTERS) {
             const setter = GL_HOOKED_SETTERS[key];
@@ -1850,13 +1871,11 @@ var __exports__ = (() => {
       if (!gl && webglProps.failIfMajorPerformanceCaveat) {
         errorMessage ||= "Only software GPU is available. Set `failIfMajorPerformanceCaveat: false` to allow.";
       }
+      let softwareRenderer = false;
       if (!gl && allowSoftwareRenderer) {
         webglProps.failIfMajorPerformanceCaveat = false;
         gl = canvas.getContext("webgl2", webglProps);
-        if (gl) {
-          gl.luma ||= {};
-          gl.luma.softwareRenderer = true;
-        }
+        softwareRenderer = true;
       }
       if (!gl) {
         gl = canvas.getContext("webgl", {});
@@ -1869,6 +1888,8 @@ var __exports__ = (() => {
         errorMessage ||= "Your browser does not support WebGL";
         throw new Error(`Failed to create WebGL context: ${errorMessage}`);
       }
+      const luma = getWebGLContextData(gl);
+      luma.softwareRenderer = softwareRenderer;
       const { onContextLost, onContextRestored } = props;
       canvas.addEventListener("webglcontextlost", (event) => onContextLost(event), false);
       canvas.addEventListener(
@@ -1876,7 +1897,6 @@ var __exports__ = (() => {
         (event) => onContextRestored(event),
         false
       );
-      gl.luma ||= {};
       return gl;
     } finally {
       canvas.removeEventListener("webglcontextcreationerror", onCreateError, false);
@@ -1885,6 +1905,7 @@ var __exports__ = (() => {
   var init_create_browser_context = __esm({
     "src/context/helpers/create-browser-context.ts"() {
       "use strict";
+      init_webgl_context_data();
     }
   });
 
@@ -2815,9 +2836,20 @@ var __exports__ = (() => {
       if (line.length <= 1) {
         continue;
       }
+      const lineWithTrimmedWhitespace = line.trim();
       const segments = line.split(":");
+      const trimmedMessageType = segments[0]?.trim();
       if (segments.length === 2) {
         const [messageType2, message2] = segments;
+        if (!messageType2 || !message2) {
+          messages.push({
+            message: lineWithTrimmedWhitespace,
+            type: getMessageType(trimmedMessageType || "info"),
+            lineNum: 0,
+            linePos: 0
+          });
+          continue;
+        }
         messages.push({
           message: message2.trim(),
           type: getMessageType(messageType2),
@@ -2827,6 +2859,15 @@ var __exports__ = (() => {
         continue;
       }
       const [messageType, linePosition, lineNumber, ...rest] = segments;
+      if (!messageType || !linePosition || !lineNumber) {
+        messages.push({
+          message: segments.slice(1).join(":").trim() || lineWithTrimmedWhitespace,
+          type: getMessageType(trimmedMessageType || "info"),
+          lineNum: 0,
+          linePos: 0
+        });
+        continue;
+      }
       let lineNum = parseInt(lineNumber, 10);
       if (isNaN(lineNum)) {
         lineNum = 0;
@@ -4068,7 +4109,11 @@ ${source}`;
       const uniformOffset = gl.getActiveUniforms(program, uniformIndices, 35387 /* UNIFORM_OFFSET */);
       const uniformStride = gl.getActiveUniforms(program, uniformIndices, 35388 /* UNIFORM_ARRAY_STRIDE */);
       for (let i = 0; i < blockInfo.uniformCount; ++i) {
-        const activeInfo = gl.getActiveUniform(program, uniformIndices[i]);
+        const uniformIndex = uniformIndices[i];
+        if (uniformIndex === void 0) {
+          continue;
+        }
+        const activeInfo = gl.getActiveUniform(program, uniformIndex);
         if (!activeInfo) {
           throw new Error("activeInfo");
         }
@@ -4099,13 +4144,12 @@ ${source}`;
     }
     const UNIFORM_NAME_REGEXP = /([^[]*)(\[[0-9]+\])?/;
     const matches = UNIFORM_NAME_REGEXP.exec(name);
-    if (!matches || matches.length < 2) {
-      throw new Error(`Failed to parse GLSL uniform name ${name}`);
-    }
+    const uniformName = (0, import_core15.assertDefined)(matches?.[1], `Failed to parse GLSL uniform name ${name}`);
     return {
-      name: matches[1],
-      length: matches[2] ? 1 : 0,
-      isArray: Boolean(matches[2])
+      name: uniformName,
+      // TODO - is this a bug, shouldn't we return the value?
+      length: matches?.[2] ? 1 : 0,
+      isArray: Boolean(matches?.[2])
     };
   }
   var import_core15;
@@ -4569,7 +4613,7 @@ ${source}`;
                 if (location === 4294967295 /* INVALID_INDEX */) {
                   throw new Error(`Invalid uniform block name ${name}`);
                 }
-                gl.uniformBlockBinding(this.handle, uniformBufferIndex, location);
+                gl.uniformBlockBinding(this.handle, location, uniformBufferIndex);
                 if (value instanceof WEBGLBuffer) {
                   gl.bindBufferBase(35345 /* UNIFORM_BUFFER */, uniformBufferIndex, value.handle);
                 } else {
@@ -4665,7 +4709,7 @@ ${source}`;
       height = options.sourceTexture.height,
       depthOrArrayLayers = 0,
       /** Defines the origin of the copy - the minimum corner of the texture sub-region to copy to/from. */
-      origin = [0, 0],
+      origin = [0, 0, 0],
       /** Destination buffer */
       destinationBuffer,
       /** Offset, in bytes, from the beginning of the buffer to the start of the image data (default 0) */
@@ -4694,9 +4738,8 @@ ${source}`;
       const webglBuffer = destinationBuffer;
       const sourceWidth = width || framebuffer.width;
       const sourceHeight = height || framebuffer.height;
-      const sourceParams = getTextureFormatWebGL(
-        framebuffer.colorAttachments[0].texture.props.format
-      );
+      const colorAttachment0 = (0, import_core17.assertDefined)(framebuffer.colorAttachments[0]);
+      const sourceParams = getTextureFormatWebGL(colorAttachment0.texture.props.format);
       const sourceFormat = sourceParams.format;
       const sourceType = sourceParams.type;
       device.gl.bindBuffer(35051 /* PIXEL_PACK_BUFFER */, webglBuffer.handle);
@@ -4731,7 +4774,7 @@ ${source}`;
       /** Defines the origin of the copy - the minimum corner of the texture sub-region to copy from. */
       origin = [0, 0],
       /** Defines the origin of the copy - the minimum corner of the texture sub-region to copy to. */
-      destinationOrigin = [0, 0],
+      destinationOrigin = [0, 0, 0],
       /** Texture to copy to/from. */
       destinationTexture
       /**  Mip-map level of the texture to copy to/from. (Default 0) */
@@ -4747,7 +4790,7 @@ ${source}`;
       // depthOrArrayLayers = 0
     } = options;
     const { framebuffer, destroyFramebuffer } = getFramebuffer(sourceTexture);
-    const [sourceX, sourceY] = origin;
+    const [sourceX = 0, sourceY = 0] = origin;
     const [destinationX, destinationY, destinationZ] = destinationOrigin;
     const prevHandle = device.gl.bindFramebuffer(
       36160 /* FRAMEBUFFER */,
@@ -4871,6 +4914,9 @@ ${source}`;
         constructor(device, props) {
           super(device, props);
           this.device = device;
+          if (!props?.framebuffer) {
+            device.getDefaultCanvasContext()._resizeDrawingBufferIfNeeded();
+          }
           let viewport;
           if (!props?.parameters?.viewport) {
             if (props?.framebuffer) {
@@ -5098,7 +5144,7 @@ ${source}`;
     const total = count * length;
     let copied = 0;
     for (let i = start; copied < length; copied++) {
-      target2[i++] = source[copied];
+      target2[i++] = source[copied] ?? 0;
     }
     while (copied < total) {
       if (copied < total - copied) {
@@ -5389,8 +5435,8 @@ ${source}`;
           this.buffers = {};
           this.unusedBuffers = {};
           this.bind(() => {
-            for (const bufferName in buffers) {
-              this.setBuffer(bufferName, buffers[bufferName]);
+            for (const [bufferName, buffer] of Object.entries(buffers)) {
+              this.setBuffer(bufferName, buffer);
             }
           });
         }
@@ -5412,7 +5458,7 @@ ${source}`;
             return this.buffers[locationOrName] || null;
           }
           const location = this._getVaryingIndex(locationOrName);
-          return location >= 0 ? this.buffers[location] : null;
+          return this.buffers[location] ?? null;
         }
         bind(funcOrHandle = this.handle) {
           if (typeof funcOrHandle !== "function") {
@@ -5459,8 +5505,8 @@ ${source}`;
          * cannot be bound to 'TRANSFORM_FEEDBACK_BUFFER' target.
          */
         _bindBuffers() {
-          for (const bufferIndex in this.buffers) {
-            const { buffer, byteLength, byteOffset } = this._getBufferRange(this.buffers[bufferIndex]);
+          for (const [bufferIndex, bufferEntry] of Object.entries(this.buffers)) {
+            const { buffer, byteLength, byteOffset } = this._getBufferRange(bufferEntry);
             this._bindBuffer(Number(bufferIndex), buffer, byteOffset, byteLength);
           }
         }
@@ -5886,6 +5932,7 @@ ${source}`;
       import_core25 = __toESM(require_core(), 1);
       init_webgl_state_tracker();
       init_create_browser_context();
+      init_webgl_context_data();
       init_webgl_device_info();
       init_webgl_device_features();
       init_webgl_device_limits();
@@ -5910,6 +5957,12 @@ ${source}`;
       init_with_parameters();
       init_webgl_extensions();
       WebGLDevice = class extends import_core25.Device {
+        static getDeviceFromContext(gl) {
+          if (!gl) {
+            return null;
+          }
+          return gl.luma?.device ?? null;
+        }
         // Public `Device` API
         /** type of this device */
         type = "webgl";
@@ -5931,7 +5984,7 @@ ${source}`;
         // @ts-ignore TODO fix
         _constants;
         /** State used by luma.gl classes - TODO - not used? */
-        _extensions = {};
+        extensions;
         _polyfilled = false;
         /** Instance of Spector.js (if initialized) */
         spectorJS;
@@ -5958,7 +6011,8 @@ ${source}`;
           if (!canvasContextProps) {
             throw new Error("WebGLDevice requires props.createCanvasContext to be set");
           }
-          let device = canvasContextProps.canvas?.gl?.device;
+          const existingContext = canvasContextProps.canvas?.gl ?? null;
+          let device = WebGLDevice.getDeviceFromContext(existingContext);
           if (device) {
             throw new Error(`WebGL context already attached to device ${device.id}`);
           }
@@ -5992,7 +6046,7 @@ ${source}`;
           if (!gl) {
             throw new Error("WebGL context creation failed");
           }
-          device = gl.device;
+          device = WebGLDevice.getDeviceFromContext(gl);
           if (device) {
             if (props._reuseDevices) {
               import_core25.log.log(
@@ -6000,6 +6054,7 @@ ${source}`;
                 `Not creating a new Device, instead returning a reference to Device ${device.id} already attached to WebGL context`,
                 device
               )();
+              this.canvasContext.destroy();
               device._reused = true;
               return device;
             }
@@ -6008,14 +6063,12 @@ ${source}`;
           this.handle = gl;
           this.gl = gl;
           this.spectorJS = initializeSpectorJS({ ...this.props, gl: this.handle });
-          this.gl.device = this;
-          this.info = getDeviceInfo(this.gl, this._extensions);
+          const contextData = getWebGLContextData(this.handle);
+          contextData.device = this;
+          this.extensions = contextData.extensions || (contextData.extensions = {});
+          this.info = getDeviceInfo(this.gl, this.extensions);
           this.limits = new WebGLDeviceLimits(this.gl);
-          this.features = new WebGLDeviceFeatures(
-            this.gl,
-            this._extensions,
-            this.props._disabledFeatures
-          );
+          this.features = new WebGLDeviceFeatures(this.gl, this.extensions, this.props._disabledFeatures);
           if (this.props._initializeFeatures) {
             this.features.initializeFeatures();
           }
@@ -6044,7 +6097,8 @@ ${source}`;
          */
         destroy() {
           if (!this.props._reuseDevices && !this._reused) {
-            delete this.gl.device;
+            const contextData = getWebGLContextData(this.handle);
+            contextData.device = null;
           }
         }
         get isLost() {
@@ -6132,7 +6186,7 @@ ${source}`;
           resetGLParameters(this.gl);
         }
         _getDeviceSpecificTextureFormatCapabilities(capabilities) {
-          return getTextureFormatCapabilitiesWebGL(this.gl, capabilities, this._extensions);
+          return getTextureFormatCapabilitiesWebGL(this.gl, capabilities, this.extensions);
         }
         //
         // WebGL-only API (not part of `Device` API)
@@ -6222,8 +6276,8 @@ ${source}`;
         }
         /** Ensure extensions are only requested once */
         getExtension(name) {
-          getWebGLExtension(this.gl, name, this._extensions);
-          return this._extensions;
+          getWebGLExtension(this.gl, name, this.extensions);
+          return this.extensions;
         }
         // INTERNAL SUPPORT METHODS FOR WEBGL RESOURCES
         /**
@@ -6291,8 +6345,9 @@ ${source}`;
           if (gl instanceof WebGLDevice2) {
             return gl;
           }
-          if (gl?.device instanceof WebGLDevice2) {
-            return gl.device;
+          const existingDevice = WebGLDevice2.getDeviceFromContext(gl);
+          if (existingDevice) {
+            return existingDevice;
           }
           if (!isWebGL(gl)) {
             throw new Error("Invalid WebGL2RenderingContext");