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

package/dist/utils/fill-array.js

@@ -8,7 +8,7 @@ export function fillArray(options) {
     const total = count * length;
     let copied = 0;
     for (let i = start; copied < length; copied++) {
-        target[i++] = source[copied];
+        target[i++] = source[copied] ?? 0;
     }
     while (copied < total) {
         // If we have copied less than half, copy everything we got

package/dist/utils/fill-array.js.map

@@ -1 +1 @@
-{"version":3,"file":"fill-array.js","sourceRoot":"","sources":["../../src/utils/fill-array.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,sEAAsE;AACtE,MAAM,UAAU,SAAS,CAAC,OAKzB;IACC,MAAM,EAAC,MAAM,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAC,GAAG,OAAO,CAAC;IACvD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,MAAM,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAC7B,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;QAC9C,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,MAAM,GAAG,KAAK,EAAE,CAAC;QACtB,2DAA2D;QAC3D,uCAAuC;QACvC,IAAI,MAAM,GAAG,KAAK,GAAG,MAAM,EAAE,CAAC;YAC5B,MAAM,CAAC,UAAU,CAAC,KAAK,GAAG,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC;YACzD,MAAM,IAAI,CAAC,CAAC;QACd,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,UAAU,CAAC,KAAK,GAAG,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC;YACjE,MAAM,GAAG,KAAK,CAAC;QACjB,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,CAAC;AACxB,CAAC"}
+{"version":3,"file":"fill-array.js","sourceRoot":"","sources":["../../src/utils/fill-array.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,sEAAsE;AACtE,MAAM,UAAU,SAAS,CAAC,OAKzB;IACC,MAAM,EAAC,MAAM,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAC,GAAG,OAAO,CAAC;IACvD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,MAAM,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAC7B,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;QAC9C,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,MAAM,GAAG,KAAK,EAAE,CAAC;QACtB,2DAA2D;QAC3D,uCAAuC;QACvC,IAAI,MAAM,GAAG,KAAK,GAAG,MAAM,EAAE,CAAC;YAC5B,MAAM,CAAC,UAAU,CAAC,KAAK,GAAG,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC;YACzD,MAAM,IAAI,CAAC,CAAC;QACd,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,UAAU,CAAC,KAAK,GAAG,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC;YACjE,MAAM,GAAG,KAAK,CAAC;QACjB,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,CAAC;AACxB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/webgl",
-  "version": "9.3.0-alpha.2",
+  "version": "9.3.0-alpha.4",
   "description": "WebGL2 adapter for the luma.gl core API",
   "type": "module",
   "license": "MIT",
@@ -43,9 +43,9 @@
     "@luma.gl/core": "9.2.0-alpha.6"
   },
   "dependencies": {
-    "@luma.gl/constants": "9.3.0-alpha.2",
+    "@luma.gl/constants": "9.3.0-alpha.4",
     "@math.gl/types": "^4.1.0",
-    "@probe.gl/env": "^4.0.8"
+    "@probe.gl/env": "^4.1.1"
   },
-  "gitHead": "7fedf8d8902f58490a4ffca9a873daee3c732f24"
+  "gitHead": "7486e7b0377fb6ab961b4499828681bede60f3b1"
 }

package/src/adapter/helpers/get-shader-layout-from-glsl.ts

@@ -10,7 +10,7 @@ import type {
   VaryingBinding,
   AttributeShaderType
 } from '@luma.gl/core';
-import {getVariableShaderTypeInfo} from '@luma.gl/core';
+import {getVariableShaderTypeInfo, assertDefined} from '@luma.gl/core';
 
 import {GL, GLUniformType} from '@luma.gl/constants';
 import {
@@ -252,7 +252,11 @@ function readUniformBlocks(
     // ); // Array of GLint indicating the strides between columns of a column-major matrix or a row-major matrix.
     // const uniformRowMajor = gl.getActiveUniforms(program, uniformIndices, GL.UNIFORM_IS_ROW_MAJOR);
     for (let i = 0; i < blockInfo.uniformCount; ++i) {
-      const activeInfo = gl.getActiveUniform(program, uniformIndices[i]);
+      const uniformIndex = uniformIndices[i];
+      if (uniformIndex === undefined) {
+        continue;
+      }
+      const activeInfo = gl.getActiveUniform(program, uniformIndex);
       if (!activeInfo) {
         throw new Error('activeInfo');
       }
@@ -314,13 +318,11 @@ function parseUniformName(name: string): {name: string; length: number; isArray:
   // if array name then clean the array brackets
   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 = 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])
   };
 }

package/src/adapter/helpers/parse-shader-compiler-log.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {CompilerMessage} from '@luma.gl/core';
+import {type CompilerMessage} from '@luma.gl/core';
 
 /**
  * Parse a WebGL-format GLSL compilation log into an array of WebGPU style message records.
@@ -20,21 +20,43 @@ export function parseShaderCompilerLog(errLog: string): readonly CompilerMessage
       continue; // eslint-disable-line no-continue
     }
 
+    const lineWithTrimmedWhitespace = line.trim();
+
     const segments: string[] = line.split(':');
+    const trimmedMessageType = segments[0]?.trim();
 
     // Check for messages with no line information `ERROR: unsupported shader version`
     if (segments.length === 2) {
       const [messageType, message] = segments;
+      if (!messageType || !message) {
+        messages.push({
+          message: lineWithTrimmedWhitespace,
+          type: getMessageType(trimmedMessageType || 'info'),
+          lineNum: 0,
+          linePos: 0
+        });
+        continue; // eslint-disable-line no-continue
+      }
       messages.push({
         message: message.trim(),
         type: getMessageType(messageType),
         lineNum: 0,
         linePos: 0
       });
+
       continue; // eslint-disable-line no-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; // eslint-disable-line no-continue
+    }
 
     let lineNum = parseInt(lineNumber, 10);
     if (isNaN(lineNum)) {

package/src/adapter/resources/webgl-command-buffer.ts

@@ -2,23 +2,19 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {
-  CopyBufferToBufferOptions,
-  CopyBufferToTextureOptions,
-  CopyTextureToBufferOptions,
-  CopyTextureToTextureOptions
-  // ClearTextureOptions,
-  // TextureReadOptions
-} from '@luma.gl/core';
-import {CommandBuffer, Texture, Framebuffer} from '@luma.gl/core';
 import {
-  GL,
-  GLTextureTarget,
-  GLTextureCubeMapTarget
-  // GLTexelDataFormat,
-  // GLPixelType,
-  // GLDataType
-} from '@luma.gl/constants';
+  type CopyBufferToBufferOptions,
+  type CopyBufferToTextureOptions,
+  type CopyTextureToBufferOptions,
+  type CopyTextureToTextureOptions,
+  // type ClearTextureOptions,
+  // type TextureReadOptions
+  CommandBuffer,
+  Texture,
+  Framebuffer,
+  assertDefined
+} from '@luma.gl/core';
+import {GL, type GLTextureTarget, type GLTextureCubeMapTarget} from '@luma.gl/constants';
 
 import {WebGLDevice} from '../webgl-device';
 import {WEBGLBuffer} from './webgl-buffer';
@@ -145,7 +141,7 @@ function _copyTextureToBuffer(device: WebGLDevice, options: CopyTextureToBufferO
     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,
@@ -181,9 +177,9 @@ function _copyTextureToBuffer(device: WebGLDevice, options: CopyTextureToBufferO
     const webglBuffer = destinationBuffer as WEBGLBuffer;
     const sourceWidth = width || framebuffer.width;
     const sourceHeight = height || framebuffer.height;
-    const sourceParams = getTextureFormatWebGL(
-      framebuffer.colorAttachments[0].texture.props.format
-    );
+    const colorAttachment0 = assertDefined(framebuffer.colorAttachments[0]);
+
+    const sourceParams = getTextureFormatWebGL(colorAttachment0.texture.props.format);
     const sourceFormat = sourceParams.format;
     const sourceType = sourceParams.type;
 
@@ -256,7 +252,7 @@ function _copyTextureToTexture(device: WebGLDevice, options: CopyTextureToTextur
     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
@@ -275,7 +271,7 @@ function _copyTextureToTexture(device: WebGLDevice, options: CopyTextureToTextur
   } = options;
 
   const {framebuffer, destroyFramebuffer} = getFramebuffer(sourceTexture);
-  const [sourceX, sourceY] = origin;
+  const [sourceX = 0, sourceY = 0] = origin;
   const [destinationX, destinationY, destinationZ] = destinationOrigin;
 
   // @ts-expect-error native bindFramebuffer is overridden by our state tracker

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

@@ -24,6 +24,12 @@ export class WEBGLRenderPass extends RenderPass {
     super(device, props);
     this.device = device;
 
+    if (!props?.framebuffer) {
+      // Default-framebuffer rendering bypasses CanvasContext.getCurrentFramebuffer(),
+      // so flush any deferred canvas resize before deriving viewport state.
+      device.getDefaultCanvasContext()._resizeDrawingBufferIfNeeded();
+    }
+
     // If no viewport is provided, apply reasonably defaults
     let viewport: NumberArray4 | undefined;
     if (!props?.parameters?.viewport) {

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

@@ -452,8 +452,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
           if ((location as GL) === GL.INVALID_INDEX) {
             throw new Error(`Invalid uniform block name ${name}`);
           }
-          gl.uniformBlockBinding(this.handle, uniformBufferIndex, location);
-          // console.debug(binding, location);
+          gl.uniformBlockBinding(this.handle, location, uniformBufferIndex);
           if (value instanceof WEBGLBuffer) {
             gl.bindBufferBase(GL.UNIFORM_BUFFER, uniformBufferIndex, value.handle);
           } else {

package/src/adapter/resources/webgl-transform-feedback.ts

@@ -69,8 +69,8 @@ export class WEBGLTransformFeedback extends TransformFeedback {
     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);
       }
     });
   }
@@ -99,7 +99,7 @@ export class WEBGLTransformFeedback extends TransformFeedback {
       return this.buffers[locationOrName] || null;
     }
     const location = this._getVaryingIndex(locationOrName);
-    return location >= 0 ? this.buffers[location] : null;
+    return this.buffers[location] ?? null;
   }
 
   bind(funcOrHandle: (() => void) | WebGLTransformFeedback | null = this.handle) {
@@ -162,8 +162,8 @@ export class WEBGLTransformFeedback extends TransformFeedback {
    * cannot be bound to 'TRANSFORM_FEEDBACK_BUFFER' target.
    */
   protected _bindBuffers(): void {
-    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);
     }
   }

package/src/adapter/webgl-adapter.ts

@@ -55,10 +55,9 @@ export class WebGLAdapter extends Adapter {
     if (gl instanceof WebGLDevice) {
       return gl;
     }
-    // @ts-expect-error
-    if (gl?.device instanceof WebGLDevice) {
-      // @ts-expect-error
-      return gl.device as WebGLDevice;
+    const existingDevice = WebGLDevice.getDeviceFromContext(gl as WebGL2RenderingContext | null);
+    if (existingDevice) {
+      return existingDevice;
     }
     if (!isWebGL(gl)) {
       throw new Error('Invalid WebGL2RenderingContext');

package/src/adapter/webgl-device.ts

@@ -36,6 +36,7 @@ import {Device, CanvasContext, log} from '@luma.gl/core';
 import type {GLExtensions} from '@luma.gl/constants';
 import {WebGLStateTracker} from '../context/state-tracker/webgl-state-tracker';
 import {createBrowserContext} from '../context/helpers/create-browser-context';
+import {getWebGLContextData} from '../context/helpers/webgl-context-data';
 import {getDeviceInfo} from './device-helpers/webgl-device-info';
 import {WebGLDeviceFeatures} from './device-helpers/webgl-device-features';
 import {WebGLDeviceLimits} from './device-helpers/webgl-device-limits';
@@ -70,6 +71,13 @@ import {getWebGLExtension} from '../context/helpers/webgl-extensions';
 
 /** WebGPU style Device API for a WebGL context */
 export class WebGLDevice extends Device {
+  static getDeviceFromContext(gl: WebGL2RenderingContext | null): WebGLDevice | null {
+    if (!gl) {
+      return null;
+    }
+    // @ts-expect-error Ingore WebGL2RenderingContext type
+    return gl.luma?.device ?? null;
+  }
   // Public `Device` API
 
   /** type of this device */
@@ -100,7 +108,7 @@ export class WebGLDevice extends Device {
   _constants: (TypedArray | null)[];
 
   /** State used by luma.gl classes - TODO - not used? */
-  readonly _extensions: GLExtensions = {};
+  readonly extensions!: GLExtensions;
   _polyfilled: boolean = false;
 
   /** Instance of Spector.js (if initialized) */
@@ -141,7 +149,8 @@ export class WebGLDevice extends Device {
     // Note that this can be avoided in webgl2adapter.create() if
     // DeviceProps._reuseDevices is set.
     // @ts-expect-error device is attached to context
-    let device: WebGLDevice | undefined = canvasContextProps.canvas?.gl?.device;
+    const existingContext = canvasContextProps.canvas?.gl ?? null;
+    let device: WebGLDevice | null = WebGLDevice.getDeviceFromContext(existingContext);
     if (device) {
       throw new Error(`WebGL context already attached to device ${device.id}`);
     }
@@ -190,8 +199,7 @@ export class WebGLDevice extends Device {
 
     // Note that the browser will only create one WebGL context per canvas.
     // This means that a newly created gl context may already have a device attached to it.
-    // @ts-expect-error luma.gl stores a device reference on the context.
-    device = gl.device;
+    device = WebGLDevice.getDeviceFromContext(gl);
     if (device) {
       if (props._reuseDevices) {
         log.log(
@@ -199,6 +207,9 @@ export class WebGLDevice extends Device {
           `Not creating a new Device, instead returning a reference to Device ${device.id} already attached to WebGL context`,
           device
         )();
+        // Destroy the orphaned canvas context that was created above (line 149)
+        // to prevent its ResizeObserver from firing callbacks with undefined device
+        this.canvasContext.destroy();
         device._reused = true;
         return device;
       }
@@ -214,16 +225,15 @@ export class WebGLDevice extends Device {
     this.spectorJS = initializeSpectorJS({...this.props, gl: this.handle});
 
     // Instrument context
-    (this.gl as any).device = this; // Update GL context: Link webgl context back to device
+    const contextData = getWebGLContextData(this.handle);
+    contextData.device = this; // Update GL context: Link webgl context back to device
+
+    this.extensions = contextData.extensions || (contextData.extensions = {});
 
     // initialize luma Device fields
-    this.info = getDeviceInfo(this.gl, this._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();
     }
@@ -265,7 +275,8 @@ export class WebGLDevice extends Device {
     // Therefore we must do nothing in destroy() if props._reuseDevices is true
     if (!this.props._reuseDevices && !this._reused) {
       // Delete the reference to the device that we store on the WebGL context
-      delete (this.gl as any).device;
+      const contextData = getWebGLContextData(this.handle);
+      contextData.device = null;
     }
   }
 
@@ -407,7 +418,7 @@ export class WebGLDevice extends Device {
   override _getDeviceSpecificTextureFormatCapabilities(
     capabilities: DeviceTextureFormatCapabilities
   ): DeviceTextureFormatCapabilities {
-    return getTextureFormatCapabilitiesWebGL(this.gl, capabilities, this._extensions);
+    return getTextureFormatCapabilitiesWebGL(this.gl, capabilities, this.extensions);
   }
 
   //
@@ -510,8 +521,8 @@ export class WebGLDevice extends Device {
 
   /** Ensure extensions are only requested once */
   getExtension(name: keyof GLExtensions): GLExtensions {
-    getWebGLExtension(this.gl, name, this._extensions);
-    return this._extensions;
+    getWebGLExtension(this.gl, name, this.extensions);
+    return this.extensions;
   }
 
   // INTERNAL SUPPORT METHODS FOR WEBGL RESOURCES

package/src/context/debug/spector.ts

@@ -4,6 +4,7 @@
 
 import {log} from '@luma.gl/core';
 import {loadScript} from '../../utils/load-script';
+import {getWebGLContextData} from '../helpers/webgl-context-data';
 
 import type {Spector} from './spector-types';
 
@@ -91,11 +92,10 @@ export function initializeSpectorJS(props: SpectorProps): Spector | null {
   if (props.gl) {
     // capture startup
     const gl = props.gl;
-    // @ts-expect-error
-    const device = gl.device;
+    const contextData = getWebGLContextData(gl);
+    const device = contextData.device;
     spector?.startCapture(props.gl, 500); // 500 commands
-    // @ts-expect-error
-    gl.device = device;
+    contextData.device = device;
 
     new Promise(resolve => setTimeout(resolve, 2000)).then(_ => {
       log.info('Spector capture stopped after 2 seconds')();

package/src/context/debug/webgl-developer-tools.ts

@@ -104,6 +104,8 @@ function getDebugContext(
   // Store the debug context
   data.realContext = gl;
   data.debugContext = debugContext;
+  // Share the context metadata object with the debug context so lookups stay consistent.
+  (debugContext as {luma?: unknown}).luma = data;
   debugContext.debug = true;
 
   // Return it

package/src/context/helpers/create-browser-context.ts

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
+import {getWebGLContextData} from './webgl-context-data';
+
 /**
  * ContextProps
  * @param onContextLost
@@ -55,15 +57,11 @@ export function createBrowserContext(
     }
 
     // Creation failed with failIfMajorPerformanceCaveat - Try a Software GPU
+    let softwareRenderer = false;
     if (!gl && allowSoftwareRenderer) {
       webglProps.failIfMajorPerformanceCaveat = false;
       gl = canvas.getContext('webgl2', webglProps);
-      if (gl) {
-        // @ts-expect-error
-        gl.luma ||= {};
-        // @ts-expect-error
-        gl.luma.softwareRenderer = true;
-      }
+      softwareRenderer = true;
     }
 
     if (!gl) {
@@ -79,6 +77,10 @@ export function createBrowserContext(
       throw new Error(`Failed to create WebGL context: ${errorMessage}`);
     }
 
+    // Initialize luma.gl specific context data
+    const luma = getWebGLContextData(gl);
+    luma.softwareRenderer = softwareRenderer;
+
     // Carefully extract and wrap callbacks to prevent addEventListener from rebinding them.
     const {onContextLost, onContextRestored} = props;
     canvas.addEventListener('webglcontextlost', (event: Event) => onContextLost(event), false);
@@ -88,8 +90,6 @@ export function createBrowserContext(
       false
     );
 
-    // @ts-expect-error
-    gl.luma ||= {};
     return gl;
   } finally {
     canvas.removeEventListener('webglcontextcreationerror', onCreateError, false);

package/src/context/helpers/webgl-context-data.ts

@@ -2,12 +2,17 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
+import type {GLExtensions} from '@luma.gl/constants';
+
 /**
  * Stores luma.gl specific state associated with a context
  */
 export interface WebGLContextData {
+  /** This type is used by lower level code that is not aware of the Device type */
+  device?: unknown;
   _polyfilled: boolean;
-  _extensions: Record<string, any>;
+  extensions: GLExtensions;
+  softwareRenderer?: boolean;
 }
 
 /**
@@ -16,16 +21,17 @@ export interface WebGLContextData {
  */
 export function getWebGLContextData(gl: WebGL2RenderingContext): WebGLContextData {
   // @ts-expect-error
-  const luma = gl.luma as WebGLContextData | null;
-  if (!luma) {
-    const contextState: WebGLContextData = {
-      _polyfilled: false,
-      _extensions: {}
-    };
-    // @ts-expect-error
-    gl.luma = contextState;
-  }
+  const contextData = (gl.luma as WebGLContextData | null) || {
+    _polyfilled: false,
+    extensions: {},
+    softwareRenderer: false
+  };
+
+  contextData._polyfilled ??= false;
+  contextData.extensions ||= {};
 
   // @ts-expect-error
-  return gl.luma;
+  gl.luma = contextData;
+
+  return contextData;
 }

package/src/context/parameters/unified-parameter-api.ts

@@ -18,7 +18,7 @@ export type {GLParameters};
 /**
  * Sets any GL parameter regardless of function (gl.blendMode, ...)
  *
- * @note requires a `cache` object to be set on the context (gl.state.cache)
+ * @note requires a `cache` object to be set on the context (lumaState.cache)
  * This object is used to fill in any missing values for composite setter functions
  */
 export function setGLParameters(gl: WebGL2RenderingContext, parameters: GLParameters): void {
@@ -58,7 +58,7 @@ export function setGLParameters(gl: WebGL2RenderingContext, parameters: GLParame
   // But it is too inconvenient to always require a cache parameter here.
   // This is the ONLY external dependency in this module/
   // @ts-expect-error
-  const cache = gl.state && gl.state.cache;
+  const cache = gl.lumaState?.cache;
   if (cache) {
     for (const key in compositeSetters) {
       // TODO - avoid calling composite setters if values have not changed.

package/src/context/state-tracker/webgl-state-tracker.ts

@@ -21,7 +21,7 @@ import {
 export class WebGLStateTracker {
   static get(gl: WebGL2RenderingContext): WebGLStateTracker {
     // @ts-expect-error
-    return gl.state as WebGLStateTracker;
+    return gl.lumaState as WebGLStateTracker;
   }
 
   gl: WebGL2RenderingContext;
@@ -78,7 +78,7 @@ export class WebGLStateTracker {
     this.initialized = true;
 
     // @ts-expect-error
-    this.gl.state = this;
+    this.gl.lumaState = this;
 
     installProgramSpy(gl);
 

package/src/utils/fill-array.ts

@@ -16,7 +16,7 @@ export function fillArray(options: {
   const total = count * length;
   let copied = 0;
   for (let i = start; copied < length; copied++) {
-    target[i++] = source[copied];
+    target[i++] = source[copied] ?? 0;
   }
 
   while (copied < total) {