@luma.gl/webgl 9.1.0-alpha.15 → 9.1.0-alpha.16

package/dist/adapter/webgl-adapter.js

@@ -1,7 +1,7 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { Adapter, Device, CanvasContext, log } from '@luma.gl/core';
+import { Adapter, Device, log } from '@luma.gl/core';
 import { WebGLDevice } from "./webgl-device.js";
 import { enforceWebGL2 } from "../context/polyfills/polyfill-webgl1-extensions.js";
 import { loadSpectorJS, DEFAULT_SPECTOR_PROPS } from "../context/debug/spector.js";
@@ -43,23 +43,18 @@ export class WebGLAdapter extends Adapter {
         if (!isWebGL(gl)) {
             throw new Error('Invalid WebGL2RenderingContext');
         }
-        return new WebGLDevice({ gl: gl });
+        return new WebGLDevice({ _handle: gl });
     }
     async create(props = {}) {
         log.groupCollapsed(LOG_LEVEL, 'WebGLDevice created')();
         const promises = [];
         // Load webgl and spector debug scripts from CDN if requested
-        if (props.debug) {
+        if (props.debugWebGL) {
             promises.push(loadWebGLDeveloperTools());
         }
-        if (props.debugWithSpectorJS) {
+        if (props.debugSpectorJS) {
             promises.push(loadSpectorJS(props));
         }
-        // Wait for page to load: if canvas is a string we need to query the DOM for the canvas element.
-        // We only wait when props.canvas is string to avoids setting the global page onload callback unless necessary.
-        if (typeof props.canvas === 'string') {
-            promises.push(CanvasContext.pageLoaded);
-        }
         // Wait for all the loads to settle before creating the context.
         // The Device.create() functions are async, so in contrast to the constructor, we can `await` here.
         const results = await Promise.allSettled(promises);
@@ -68,7 +63,6 @@ export class WebGLAdapter extends Adapter {
                 log.error(`Failed to initialize debug libraries ${result.reason}`)();
             }
         }
-        log.probe(LOG_LEVEL + 1, 'DOM is loaded')();
         const device = new WebGLDevice(props);
         // Log some debug info about the newly created context
         const message = `\

package/dist/adapter/webgl-device.d.ts

@@ -1,12 +1,11 @@
 import type { TypedArray } from '@math.gl/types';
-import type { DeviceProps, DeviceInfo, CanvasContextProps, TextureFormat, Buffer, Texture, Framebuffer, VertexArray, VertexArrayProps } from '@luma.gl/core';
+import type { DeviceProps, DeviceInfo, CanvasContextProps, TextureFormat, Buffer, Texture, Framebuffer, VertexArray, VertexArrayProps, BufferProps, ShaderProps, SamplerProps, TextureProps, ExternalTexture, ExternalTextureProps, FramebufferProps, RenderPipelineProps, ComputePipeline, ComputePipelineProps, RenderPassProps, ComputePass, ComputePassProps, CommandEncoderProps, TransformFeedbackProps, QuerySetProps } from '@luma.gl/core';
 import { Device, CanvasContext } from '@luma.gl/core';
 import type { GLExtensions } from '@luma.gl/constants';
 import { WebGLDeviceFeatures } from "./device-helpers/webgl-device-features.js";
 import { WebGLDeviceLimits } from "./device-helpers/webgl-device-limits.js";
 import { WebGLCanvasContext } from "./webgl-canvas-context.js";
 import type { Spector } from "../context/debug/spector-types.js";
-import type { BufferProps, ShaderProps, SamplerProps, TextureProps, ExternalTexture, ExternalTextureProps, FramebufferProps, RenderPipelineProps, ComputePipeline, ComputePipelineProps, RenderPassProps, ComputePass, ComputePassProps, CommandEncoderProps, TransformFeedbackProps, QuerySetProps } from '@luma.gl/core';
 import { WEBGLBuffer } from "./resources/webgl-buffer.js";
 import { WEBGLShader } from "./resources/webgl-shader.js";
 import { WEBGLSampler } from "./resources/webgl-sampler.js";

package/dist/adapter/webgl-device.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-device.d.ts","sourceRoot":"","sources":["../../src/adapter/webgl-device.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webgl-device.d.ts","sourceRoot":"","sources":["../../src/adapter/webgl-device.ts"],"names":[],"mappings":"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"}

package/dist/adapter/webgl-device.js

@@ -58,29 +58,48 @@ export class WebGLDevice extends Device {
     //
     constructor(props) {
         super({ ...props, id: props.id || uid('webgl-device') });
+        // WebGL requires a canvas to be created before creating the context
+        if (!props.createCanvasContext) {
+            throw new Error('WebGLDevice requires props.createCanvasContext to be set');
+        }
+        const canvasContextProps = props.createCanvasContext === true ? {} : props.createCanvasContext;
         // If attaching to an already attached context, return the attached device
         // @ts-expect-error device is attached to context
-        const device = props.gl?.device;
+        let device = canvasContextProps.canvas?.gl?.device;
         if (device) {
             throw new Error(`WebGL context already attached to device ${device.id}`);
         }
         // Create and instrument context
-        const canvas = props.gl?.canvas || props.canvas;
-        this.canvasContext = new WebGLCanvasContext(this, { ...props, canvas });
+        this.canvasContext = new WebGLCanvasContext(this, canvasContextProps);
         this.lost = new Promise(resolve => {
             this._resolveContextLost = resolve;
         });
-        this.handle = createBrowserContext(this.canvasContext.canvas, {
-            ...props,
+        const webglContextAttributes = { ...props.webgl };
+        // Copy props from CanvasContextProps
+        if (canvasContextProps.alphaMode === 'premultiplied') {
+            webglContextAttributes.premultipliedAlpha = true;
+        }
+        if (props.powerPreference !== undefined) {
+            webglContextAttributes.powerPreference = props.powerPreference;
+        }
+        const gl = createBrowserContext(this.canvasContext.canvas, {
             onContextLost: (event) => this._resolveContextLost?.({
                 reason: 'destroyed',
                 message: 'Entered sleep mode, or too many apps or browser tabs are using the GPU.'
-            })
-        });
-        this.gl = this.handle;
-        if (!this.handle) {
+            }),
+            // eslint-disable-next-line no-console
+            onContextRestored: (event) => console.log('WebGL context restored')
+        }, webglContextAttributes);
+        if (!gl) {
             throw new Error('WebGL context creation failed');
         }
+        // @ts-expect-error device is attached to context
+        device = gl.device;
+        if (device) {
+            throw new Error(`WebGL context already attached to device ${device.id}`);
+        }
+        this.handle = gl;
+        this.gl = gl;
         // Add spector debug instrumentation to context
         // We need to trust spector integration to decide if spector should be initialized
         // We also run spector instrumentation first, otherwise spector can clobber luma instrumentation.
@@ -91,8 +110,8 @@ export class WebGLDevice extends Device {
         // initialize luma Device fields
         this.info = getDeviceInfo(this.gl, this._extensions);
         this.limits = new WebGLDeviceLimits(this.gl);
-        this.features = new WebGLDeviceFeatures(this.gl, this._extensions, this.props.disabledFeatures);
-        if (this.props.initalizeFeatures) {
+        this.features = new WebGLDeviceFeatures(this.gl, this._extensions, this.props._disabledFeatures);
+        if (this.props._initializeFeatures) {
             this.features.initializeFeatures();
         }
         this.canvasContext.resize();
@@ -102,8 +121,8 @@ export class WebGLDevice extends Device {
         });
         glState.trackState(this.gl, { copyState: false });
         // DEBUG contexts: Add luma debug instrumentation to the context, force log level to at least 1
-        if (props.debug) {
-            this.gl = makeDebugContext(this.gl, { ...props, throwOnError: true });
+        if (props.debugWebGL) {
+            this.gl = makeDebugContext(this.gl, { ...props });
             this.debug = true;
             log.level = Math.max(log.level, 1);
             log.warn('WebGL debug mode activated. Performance reduced.')();
@@ -131,7 +150,7 @@ export class WebGLDevice extends Device {
         throw new Error('WebGL only supports a single canvas');
     }
     createBuffer(props) {
-        const newProps = this._getBufferProps(props);
+        const newProps = this._normalizeBufferProps(props);
         return new WEBGLBuffer(this, newProps);
     }
     createTexture(props) {

package/dist/context/debug/spector-types.js

@@ -1,5 +1,5 @@
 // Forked from https://github.com/BabylonJS/Spector.js/blob/master/dist/spector.d.ts
-/* eslint-disable camelcase */
+/* eslint-disable camelcase, no-shadow */
 var LogLevel;
 (function (LogLevel) {
     LogLevel[LogLevel["noLog"] = 0] = "noLog";

package/dist/context/debug/spector.d.ts

@@ -1,10 +1,10 @@
-import { Spector } from "./spector-types.js";
+import type { Spector } from "./spector-types.js";
 /** Spector debug initialization options */
 type SpectorProps = {
-    /** Whether spector is enabled */
-    debugWithSpectorJS?: boolean;
+    /** Whether spector.js is enabled */
+    debugSpectorJS?: boolean;
     /** URL to load spector script from. Typically a CDN URL */
-    spectorUrl?: string;
+    debugSpectorJSUrl?: string;
     /** Canvas to monitor */
     gl?: WebGL2RenderingContext;
 };
@@ -14,7 +14,7 @@ declare global {
 export declare const DEFAULT_SPECTOR_PROPS: Required<SpectorProps>;
 /** Loads spector from CDN if not already installed */
 export declare function loadSpectorJS(props: {
-    spectorUrl?: string;
+    debugSpectorJSUrl?: string;
 }): Promise<void>;
 export declare function initializeSpectorJS(props: SpectorProps): Spector | null;
 export {};

package/dist/context/debug/spector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spector.d.ts","sourceRoot":"","sources":["../../../src/context/debug/spector.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,OAAO,EAAC,2BAAwB;AAExC,2CAA2C;AAC3C,KAAK,YAAY,GAAG;IAClB,iCAAiC;IACjC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,2DAA2D;IAC3D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wBAAwB;IACxB,EAAE,CAAC,EAAE,sBAAsB,CAAC;CAC7B,CAAC;AAOF,OAAO,CAAC,MAAM,CAAC;IAGb,IAAI,OAAO,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,YAAY,CAOxD,CAAC;AAEF,sDAAsD;AACtD,wBAAsB,aAAa,CAAC,KAAK,EAAE;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ/E;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,GAAG,IAAI,CAyDvE"}
+{"version":3,"file":"spector.d.ts","sourceRoot":"","sources":["../../../src/context/debug/spector.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,OAAO,EAAC,2BAAwB;AAE7C,2CAA2C;AAC3C,KAAK,YAAY,GAAG;IAClB,oCAAoC;IACpC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,2DAA2D;IAC3D,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,wBAAwB;IACxB,EAAE,CAAC,EAAE,sBAAsB,CAAC;CAC7B,CAAC;AAOF,OAAO,CAAC,MAAM,CAAC;IAGb,IAAI,OAAO,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,YAAY,CAOxD,CAAC;AAEF,sDAAsD;AACtD,wBAAsB,aAAa,CAAC,KAAK,EAAE;IAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAQtF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,GAAG,IAAI,CAyDvE"}

package/dist/context/debug/spector.js

@@ -7,18 +7,18 @@ const LOG_LEVEL = 1;
 let spector = null;
 let initialized = false;
 export const DEFAULT_SPECTOR_PROPS = {
-    debugWithSpectorJS: log.get('spector') || log.get('spectorjs'),
+    debugSpectorJS: log.get('debug-spectorjs'),
     // https://github.com/BabylonJS/Spector.js#basic-usage
     // https://forum.babylonjs.com/t/spectorcdn-is-temporarily-off/48241
     // spectorUrl: 'https://spectorcdn.babylonjs.com/spector.bundle.js';
-    spectorUrl: 'https://cdn.jsdelivr.net/npm/spectorjs@0.9.30/dist/spector.bundle.js',
+    debugSpectorJSUrl: 'https://cdn.jsdelivr.net/npm/spectorjs@0.9.30/dist/spector.bundle.js',
     gl: undefined
 };
 /** Loads spector from CDN if not already installed */
 export async function loadSpectorJS(props) {
     if (!globalThis.SPECTOR) {
         try {
-            await loadScript(props.spectorUrl || DEFAULT_SPECTOR_PROPS.spectorUrl);
+            await loadScript(props.debugSpectorJSUrl || DEFAULT_SPECTOR_PROPS.debugSpectorJSUrl);
         }
         catch (error) {
             log.warn(String(error));
@@ -27,13 +27,13 @@ export async function loadSpectorJS(props) {
 }
 export function initializeSpectorJS(props) {
     props = { ...DEFAULT_SPECTOR_PROPS, ...props };
-    if (!props.debugWithSpectorJS) {
+    if (!props.debugSpectorJS) {
         return null;
     }
     if (!spector && globalThis.SPECTOR && !globalThis.luma?.spector) {
         log.probe(LOG_LEVEL, 'SPECTOR found and initialized. Start with `luma.spector.displayUI()`')();
-        const { Spector } = globalThis.SPECTOR;
-        spector = new Spector();
+        const { Spector: SpectorJS } = globalThis.SPECTOR;
+        spector = new SpectorJS();
         if (globalThis.luma) {
             globalThis.luma.spector = spector;
         }

package/dist/context/debug/webgl-developer-tools.d.ts

@@ -1,7 +1,5 @@
 type DebugContextProps = {
-    debug?: boolean;
-    throwOnError?: boolean;
-    break?: string[];
+    debugWebGL?: boolean;
 };
 declare global {
     var WebGLDebugUtils: any;

package/dist/context/debug/webgl-developer-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-developer-tools.d.ts","sourceRoot":"","sources":["../../../src/context/debug/webgl-developer-tools.ts"],"names":[],"mappings":"AAYA,KAAK,iBAAiB,GAAG;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAoBF,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,eAAe,EAAE,GAAG,CAAC;CAC1B;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC,CAO7D;AAID,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,sBAAsB,EAC1B,KAAK,GAAE,iBAAsB,GAC5B,sBAAsB,CAExB"}
+{"version":3,"file":"webgl-developer-tools.d.ts","sourceRoot":"","sources":["../../../src/context/debug/webgl-developer-tools.ts"],"names":[],"mappings":"AAYA,KAAK,iBAAiB,GAAG;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAaF,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,eAAe,EAAE,GAAG,CAAC;CAC1B;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC,CAO7D;AAID,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,sBAAsB,EAC1B,KAAK,GAAE,iBAAsB,GAC5B,sBAAsB,CAExB"}

package/dist/context/debug/webgl-developer-tools.js

@@ -29,7 +29,7 @@ export async function loadWebGLDeveloperTools() {
 // Returns (a potentially new) context with debug instrumentation turned off or on.
 // Note that this actually returns a new context
 export function makeDebugContext(gl, props = {}) {
-    return props.debug ? getDebugContext(gl, props) : getRealContext(gl);
+    return props.debugWebGL ? getDebugContext(gl, props) : getRealContext(gl);
 }
 // Returns the real context from either of the real/debug contexts
 function getRealContext(gl) {
@@ -88,9 +88,7 @@ function onGLError(props, err, functionName, args) {
     const message = `${errorMessage} in gl.${functionName}(${functionArgs})`;
     log.error(message)();
     debugger; // eslint-disable-line
-    if (props.throwOnError) {
-        throw new Error(message);
-    }
+    // throw new Error(message);
 }
 // Don't generate function string until it is needed
 function onValidateGLFunc(props, functionName, functionArgs) {
@@ -99,24 +97,11 @@ function onValidateGLFunc(props, functionName, functionArgs) {
         functionString = getFunctionString(functionName, functionArgs);
         log.log(1, functionString)();
     }
-    // If array of breakpoint strings supplied, check if any of them is contained in current GLEnum function
-    if (props.break && props.break.length > 0) {
-        functionString = functionString || getFunctionString(functionName, functionArgs);
-        const isBreakpoint = props.break.every((breakOn) => functionString.indexOf(breakOn) !== -1);
-        if (isBreakpoint) {
-            debugger; // eslint-disable-line
-        }
-    }
     for (const arg of functionArgs) {
         if (arg === undefined) {
             functionString = functionString || getFunctionString(functionName, functionArgs);
-            if (props.throwOnError) {
-                throw new Error(`Undefined argument: ${functionString}`);
-            }
-            else {
-                log.error(`Undefined argument: ${functionString}`)();
-                debugger; // eslint-disable-line
-            }
+            debugger; // eslint-disable-line
+            // throw new Error(`Undefined argument: ${functionString}`);
         }
     }
 }

package/dist/context/helpers/create-browser-context.d.ts

@@ -1,35 +1,19 @@
 /**
  * ContextProps
  * @param onContextLost
- * @param onContextRestored
- *
- * BROWSER CONTEXT PARAMETERS
- * @param debug Instrument context (at the expense of performance).
- * @param alpha Default render target has an alpha buffer.
- * @param depth Default render target has a depth buffer of at least 16 bits.
- * @param stencil Default render target has a stencil buffer of at least 8 bits.
- * @param antialias Boolean that indicates whether or not to perform anti-aliasing.
- * @param premultipliedAlpha Boolean that indicates that the page compositor will assume the drawing buffer contains colors with pre-multiplied alpha.
- * @param preserveDrawingBuffer Default render target buffers will not be automatically cleared and will preserve their values until cleared or overwritten
- * @param failIfMajorPerformanceCaveat Do not create if the system performance is low.
+ * @param onContextRestored *
  */
 type ContextProps = {
-    onContextLost?: (event: Event) => void;
-    onContextRestored?: (event: Event) => void;
-    alpha?: boolean;
-    desynchronized?: boolean;
-    antialias?: boolean;
-    depth?: boolean;
-    failIfMajorPerformanceCaveat?: boolean;
-    powerPreference?: 'default' | 'high-performance' | 'low-power';
-    premultipliedAlpha?: boolean;
-    preserveDrawingBuffer?: boolean;
+    /** Called when a context is lost */
+    onContextLost: (event: Event) => void;
+    /** Called when a context is restored */
+    onContextRestored: (event: Event) => void;
 };
 /**
  * Create a WebGL context for a canvas
  * Note calling this multiple time on the same canvas does return the same context
  * @param canvas A canvas element or offscreen canvas
  */
-export declare function createBrowserContext(canvas: HTMLCanvasElement | OffscreenCanvas, props: ContextProps): WebGL2RenderingContext;
+export declare function createBrowserContext(canvas: HTMLCanvasElement | OffscreenCanvas, props: ContextProps, webglContextAttributes: WebGLContextAttributes): WebGL2RenderingContext;
 export {};
 //# sourceMappingURL=create-browser-context.d.ts.map

package/dist/context/helpers/create-browser-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-browser-context.d.ts","sourceRoot":"","sources":["../../../src/context/helpers/create-browser-context.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,KAAK,YAAY,GAAG;IAClB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACvC,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAC3C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,eAAe,CAAC,EAAE,SAAS,GAAG,kBAAkB,GAAG,WAAW,CAAC;IAC/D,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAUF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,iBAAiB,GAAG,eAAe,EAC3C,KAAK,EAAE,YAAY,GAClB,sBAAsB,CA+CxB"}
+{"version":3,"file":"create-browser-context.d.ts","sourceRoot":"","sources":["../../../src/context/helpers/create-browser-context.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,KAAK,YAAY,GAAG;IAClB,oCAAoC;IACpC,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACtC,wCAAwC;IACxC,iBAAiB,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,iBAAiB,GAAG,eAAe,EAC3C,KAAK,EAAE,YAAY,EACnB,sBAAsB,EAAE,sBAAsB,GAC7C,sBAAsB,CA6CxB"}

package/dist/context/helpers/create-browser-context.js

@@ -1,49 +1,43 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-const DEFAULT_CONTEXT_PROPS = {
-    powerPreference: 'high-performance', // After all, most apps are using WebGL for performance reasons
-    // eslint-disable-next-line no-console
-    onContextLost: () => console.error('WebGL context lost'),
-    // eslint-disable-next-line no-console
-    onContextRestored: () => console.info('WebGL context restored')
-};
 /**
  * Create a WebGL context for a canvas
  * Note calling this multiple time on the same canvas does return the same context
  * @param canvas A canvas element or offscreen canvas
  */
-export function createBrowserContext(canvas, props) {
-    props = { ...DEFAULT_CONTEXT_PROPS, ...props };
+export function createBrowserContext(canvas, props, webglContextAttributes) {
     // Try to extract any extra information about why context creation failed
-    let errorMessage = null;
-    const onCreateError = error => (errorMessage = error.statusMessage || errorMessage);
-    canvas.addEventListener('webglcontextcreationerror', onCreateError, false);
+    const errorMessage = null;
+    // const onCreateError = error => (errorMessage = error.statusMessage || errorMessage);
+    // Avoid multiple listeners?
+    // canvas.removeEventListener('webglcontextcreationerror', onCreateError, false);
+    // canvas.addEventListener('webglcontextcreationerror', onCreateError, false);
+    const webglProps = {
+        preserveDrawingBuffer: true,
+        // failIfMajorPerformanceCaveat: true,
+        ...webglContextAttributes
+    };
     // Create the desired context
     let gl = null;
-    // props.failIfMajorPerformanceCaveat = true;
-    // We require webgl2 context
-    gl ||= canvas.getContext('webgl2', props);
-    // Software GPU
-    // props.failIfMajorPerformanceCaveat = false;
-    // if (!gl && props.webgl1) {
-    //   gl = canvas.getContext('webgl', props);
-    // }
-    // TODO are we removing this listener before giving it a chance to fire?
-    canvas.removeEventListener('webglcontextcreationerror', onCreateError, false);
+    // Create a webgl2 context
+    gl ||= canvas.getContext('webgl2', webglProps);
+    // Creation failed with failIfMajorPerformanceCaveat - Try a Software GPU
+    if (!gl && !webglContextAttributes.failIfMajorPerformanceCaveat) {
+        webglProps.failIfMajorPerformanceCaveat = false;
+        gl = canvas.getContext('webgl', webglProps);
+        // @ts-expect-error
+        gl.luma ||= {};
+        // @ts-expect-error
+        gl.luma.softwareRenderer = true;
+    }
     if (!gl) {
         throw new Error(`Failed to create WebGL context: ${errorMessage || 'Unknown error'}`);
     }
-    if (props.onContextLost) {
-        // Carefully extract and wrap callbacks to prevent addEventListener from rebinding them.
-        const { onContextLost } = props;
-        canvas.addEventListener('webglcontextlost', (event) => onContextLost(event), false);
-    }
-    if (props.onContextRestored) {
-        // Carefully extract and wrap callbacks to prevent addEventListener from rebinding them.
-        const { onContextRestored } = props;
-        canvas.addEventListener('webglcontextrestored', (event) => onContextRestored(event), false);
-    }
+    // Carefully extract and wrap callbacks to prevent addEventListener from rebinding them.
+    const { onContextLost, onContextRestored } = props;
+    canvas.addEventListener('webglcontextlost', (event) => onContextLost(event), false);
+    canvas.addEventListener('webglcontextrestored', (event) => onContextRestored(event), false);
     return gl;
 }
 /* TODO - can we call this asynchronously to catch the error events?