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

package/dist/index.cjs

@@ -155,6 +155,24 @@ var init_load_script = __esm({
   }
 });
 
+// dist/context/helpers/webgl-context-data.js
+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({
+  "dist/context/helpers/webgl-context-data.js"() {
+    "use strict";
+  }
+});
+
 // dist/context/debug/spector.js
 async function loadSpectorJS(props) {
   if (!globalThis.SPECTOR) {
@@ -195,9 +213,10 @@ function initializeSpectorJS(props) {
   }
   if (props.gl) {
     const gl = props.gl;
-    const device = gl.device;
+    const contextData = getWebGLContextData(gl);
+    const device = contextData.device;
     spector == null ? void 0 : 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 == null ? void 0 : spector.stopCapture();
@@ -211,6 +230,7 @@ var init_spector = __esm({
     "use strict";
     import_core = require("@luma.gl/core");
     init_load_script();
+    init_webgl_context_data();
     LOG_LEVEL = 1;
     spector = null;
     initialized = false;
@@ -226,7 +246,7 @@ var init_spector = __esm({
 });
 
 // dist/context/debug/webgl-developer-tools.js
-function getWebGLContextData(gl) {
+function getWebGLContextData2(gl) {
   gl.luma = gl.luma || {};
   return gl.luma;
 }
@@ -241,7 +261,7 @@ function makeDebugContext(gl, props = {}) {
   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) {
@@ -249,7 +269,7 @@ function getDebugContext(gl, props) {
     import_core2.log.warn("webgl-debug not loaded")();
     return gl;
   }
-  const data = getWebGLContextData(gl);
+  const data = getWebGLContextData2(gl);
   if (data.debugContext) {
     return data.debugContext;
   }
@@ -267,6 +287,7 @@ function getDebugContext(gl, props) {
   const debugContext = Object.create(WebGLDebugContext);
   data.realContext = gl;
   data.debugContext = debugContext;
+  debugContext.luma = data;
   debugContext.debug = true;
   return debugContext;
 }
@@ -791,6 +812,7 @@ var init_webgl_parameter_tables = __esm({
 
 // dist/context/parameters/unified-parameter-api.js
 function setGLParameters(gl, parameters) {
+  var _a;
   if (isObjectEmpty(parameters)) {
     return;
   }
@@ -806,7 +828,7 @@ function setGLParameters(gl, parameters) {
       }
     }
   }
-  const cache = gl.state && gl.state.cache;
+  const cache = (_a = gl.lumaState) == null ? void 0 : _a.cache;
   if (cache) {
     for (const key in compositeSetters) {
       const compositeSetter = GL_COMPOSITE_PARAMETER_SETTERS[key];
@@ -929,7 +951,7 @@ var init_webgl_state_tracker = __esm({
     init_webgl_parameter_tables();
     WebGLStateTracker = class {
       static get(gl) {
-        return gl.state;
+        return gl.lumaState;
       }
       gl;
       program = null;
@@ -967,7 +989,7 @@ var init_webgl_state_tracker = __esm({
           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];
@@ -1027,13 +1049,11 @@ function createBrowserContext(canvas, props, webglContextAttributes) {
     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", {});
@@ -1046,10 +1066,11 @@ function createBrowserContext(canvas, props, webglContextAttributes) {
       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("webglcontextrestored", (event) => onContextRestored(event), false);
-    gl.luma ||= {};
     return gl;
   } finally {
     canvas.removeEventListener("webglcontextcreationerror", onCreateError, false);
@@ -1058,6 +1079,7 @@ function createBrowserContext(canvas, props, webglContextAttributes) {
 var init_create_browser_context = __esm({
   "dist/context/helpers/create-browser-context.js"() {
     "use strict";
+    init_webgl_context_data();
   }
 });
 
@@ -1988,15 +2010,27 @@ var init_webgl_buffer = __esm({
 
 // dist/adapter/helpers/parse-shader-compiler-log.js
 function parseShaderCompilerLog(errLog) {
+  var _a;
   const lines = errLog.split(/\r?\n/);
   const messages = [];
   for (const line of lines) {
     if (line.length <= 1) {
       continue;
     }
+    const lineWithTrimmedWhitespace = line.trim();
     const segments = line.split(":");
+    const trimmedMessageType = (_a = segments[0]) == null ? void 0 : _a.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),
@@ -2006,6 +2040,15 @@ function parseShaderCompilerLog(errLog) {
       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;
@@ -3203,7 +3246,11 @@ function readUniformBlocks(gl, program) {
     const uniformOffset = gl.getActiveUniforms(program, uniformIndices, 35387);
     const uniformStride = gl.getActiveUniforms(program, uniformIndices, 35388);
     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");
       }
@@ -3234,13 +3281,12 @@ function parseUniformName(name) {
   }
   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 == null ? void 0 : 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 == null ? void 0 : matches[2]) ? 1 : 0,
+    isArray: Boolean(matches == null ? void 0 : matches[2])
   };
 }
 var import_core15, import_constants17;
@@ -3701,7 +3747,7 @@ var init_webgl_render_pipeline = __esm({
               if (location === 4294967295) {
                 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, uniformBufferIndex, value.handle);
               } else {
@@ -3789,7 +3835,7 @@ function _copyTextureToBuffer(device, options) {
     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) */
@@ -3818,7 +3864,8 @@ function _copyTextureToBuffer(device, options) {
     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, webglBuffer.handle);
@@ -3845,7 +3892,7 @@ function _copyTextureToTexture(device, options) {
     /** 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) */
@@ -3861,7 +3908,7 @@ function _copyTextureToTexture(device, options) {
     // 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.handle);
   let texture;
@@ -3966,6 +4013,9 @@ var init_webgl_render_pass = __esm({
         var _a;
         super(device, props);
         this.device = device;
+        if (!(props == null ? void 0 : props.framebuffer)) {
+          device.getDefaultCanvasContext()._resizeDrawingBufferIfNeeded();
+        }
         let viewport;
         if (!((_a = props == null ? void 0 : props.parameters) == null ? void 0 : _a.viewport)) {
           if (props == null ? void 0 : props.framebuffer) {
@@ -4169,7 +4219,7 @@ function fillArray(options) {
   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) {
@@ -4461,8 +4511,8 @@ var init_webgl_transform_feedback = __esm({
         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);
           }
         });
       }
@@ -4484,7 +4534,7 @@ var init_webgl_transform_feedback = __esm({
           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") {
@@ -4531,8 +4581,8 @@ var init_webgl_transform_feedback = __esm({
        * 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);
         }
       }
@@ -4949,6 +4999,7 @@ var init_webgl_device = __esm({
     import_core25 = require("@luma.gl/core");
     init_webgl_state_tracker();
     init_create_browser_context();
+    init_webgl_context_data();
     init_webgl_device_info();
     init_webgl_device_features();
     init_webgl_device_limits();
@@ -4973,6 +5024,13 @@ var init_webgl_device = __esm({
     init_with_parameters();
     init_webgl_extensions();
     WebGLDevice = class extends import_core25.Device {
+      static getDeviceFromContext(gl) {
+        var _a;
+        if (!gl) {
+          return null;
+        }
+        return ((_a = gl.luma) == null ? void 0 : _a.device) ?? null;
+      }
       // Public `Device` API
       /** type of this device */
       type = "webgl";
@@ -4994,7 +5052,7 @@ var init_webgl_device = __esm({
       // @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;
@@ -5016,13 +5074,14 @@ var init_webgl_device = __esm({
         }
       }
       constructor(props) {
-        var _a, _b;
+        var _a;
         super({ ...props, id: props.id || uid("webgl-device") });
         const canvasContextProps = import_core25.Device._getCanvasContextProps(props);
         if (!canvasContextProps) {
           throw new Error("WebGLDevice requires props.createCanvasContext to be set");
         }
-        let device = (_b = (_a = canvasContextProps.canvas) == null ? void 0 : _a.gl) == null ? void 0 : _b.device;
+        const existingContext = ((_a = canvasContextProps.canvas) == null ? void 0 : _a.gl) ?? null;
+        let device = WebGLDevice.getDeviceFromContext(existingContext);
         if (device) {
           throw new Error(`WebGL context already attached to device ${device.id}`);
         }
@@ -5055,10 +5114,11 @@ var init_webgl_device = __esm({
         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(1, `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;
           }
@@ -5067,10 +5127,12 @@ var init_webgl_device = __esm({
         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();
         }
@@ -5099,7 +5161,8 @@ var init_webgl_device = __esm({
        */
       destroy() {
         if (!this.props._reuseDevices && !this._reused) {
-          delete this.gl.device;
+          const contextData = getWebGLContextData(this.handle);
+          contextData.device = null;
         }
       }
       get isLost() {
@@ -5187,7 +5250,7 @@ var init_webgl_device = __esm({
         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)
@@ -5275,8 +5338,8 @@ var init_webgl_device = __esm({
       }
       /** 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
       /**
@@ -5344,8 +5407,9 @@ var init_webgl_adapter = __esm({
         if (gl instanceof WebGLDevice2) {
           return gl;
         }
-        if ((gl == null ? void 0 : gl.device) instanceof WebGLDevice2) {
-          return gl.device;
+        const existingDevice = WebGLDevice2.getDeviceFromContext(gl);
+        if (existingDevice) {
+          return existingDevice;
         }
         if (!isWebGL(gl)) {
           throw new Error("Invalid WebGL2RenderingContext");