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

package/dist/adapter/resources/webgl-texture.js

@@ -19,46 +19,22 @@ import { initializeTextureStorage,
 copyExternalImageToMipLevel, copyCPUDataToMipLevel, 
 // copyGPUBufferToMipLevel,
 getWebGLTextureTarget } from "../helpers/webgl-texture-utils.js";
-// PORTABLE HELPERS (Move to methods on Texture?)
-/**
- * Normalize TextureData to an array of TextureLevelData / ExternalImages
- * @param data
- * @param options
- * @returns array of TextureLevelData / ExternalImages
- */
-function normalizeTextureData(data, options) {
-    let lodArray;
-    if (ArrayBuffer.isView(data)) {
-        lodArray = [
-            {
-                // ts-expect-error does data really need to be Uint8ClampedArray?
-                data,
-                width: options.width,
-                height: options.height
-                // depth: options.depth
-            }
-        ];
-    }
-    else if (!Array.isArray(data)) {
-        lodArray = [data];
-    }
-    else {
-        lodArray = data;
-    }
-    return lodArray;
-}
 /**
  * WebGL... the texture API from hell... hopefully made simpler
  */
 export class WEBGLTexture extends Texture {
-    MAX_ATTRIBUTES;
+    // readonly MAX_ATTRIBUTES: number;
     device;
     gl;
     handle;
     sampler = undefined; // TODO - currently unused in WebGL. Create dummy sampler?
     view = undefined; // TODO - currently unused in WebGL. Create dummy view?
-    mipmaps = false;
+    mipmaps;
+    // Texture type
+    /** Whether the internal format is compressed */
+    compressed;
     /**
+     * The WebGL target corresponding to the texture type
      * @note `target` cannot be modified by bind:
      * textures are special because when you first bind them to a target,
      * When you first bind a texture as a GL_TEXTURE_2D, you are saying that this texture is a 2D texture.
@@ -67,143 +43,86 @@ export class WEBGLTexture extends Texture {
      * attempting to bind it as GL_TEXTURE_3D will give rise to a run-time error
      */
     glTarget;
-    // Texture type
     /** The WebGL format - essentially channel structure */
     glFormat;
     /** The WebGL data format - the type of each channel */
     glType;
     /** The WebGL constant corresponding to the WebGPU style constant in format */
     glInternalFormat;
-    /** Whether the internal format is compressed */
-    compressed;
-    // data;
-    // inherited props
-    // dimension: ...
-    // format: GLTextureTarget;
-    // width: number = undefined;
-    // height: number = undefined;
-    // depth: number = undefined;
     // state
-    /** Texture binding slot */
+    /** Texture binding slot - TODO - move to texture view? */
     textureUnit = 0;
-    /** For automatically updating video */
-    _video = null;
     constructor(device, props) {
-        props = Texture._fixProps(props);
-        // Note: Clear out `props.data` so that we don't hold a reference to any big memory chunks
-        super(device, { ...Texture.defaultProps, ...props, data: undefined });
+        super(device, props);
+        // Texture base class strips out the data prop, so we need to add it back in
+        const propsWithData = { ...this.props };
+        propsWithData.data = props.data;
         this.device = device;
         this.gl = this.device.gl;
         // Note: In WebGL the texture target defines the type of texture on first bind.
         this.glTarget = getWebGLTextureTarget(this.props.dimension);
         // The target format of this texture
-        const format = getTextureFormatWebGL(this.props.format);
-        this.glInternalFormat = format.internalFormat;
-        this.glFormat = format.format;
-        this.glType = format.type;
-        this.compressed = format.compressed;
-        if (typeof HTMLVideoElement !== 'undefined' &&
-            props.data instanceof HTMLVideoElement &&
-            // @ts-expect-error
-            props.data.readyState < HTMLVideoElement.HAVE_METADATA) {
-            const video = props.data;
-            this._video = null; // Declare member before the object is sealed
-            video.addEventListener('loadeddata', () => this.initialize(props));
-        }
-        // We removed data, we need to add it again.
-        // @ts-expect-error
-        this.initialize({ ...this.props, data: props.data });
+        const formatInfo = getTextureFormatWebGL(this.props.format);
+        this.glInternalFormat = formatInfo.internalFormat;
+        this.glFormat = formatInfo.format;
+        this.glType = formatInfo.type;
+        this.compressed = formatInfo.compressed;
+        this.mipmaps = Boolean(this.props.mipmaps);
+        this._initialize(propsWithData);
         Object.seal(this);
     }
     /**
      * Initialize texture with supplied props
      */
     // eslint-disable-next-line max-statements
-    initialize(props = {}) {
+    _initialize(propsWithData) {
         this.handle = this.props.handle || this.gl.createTexture();
-        this.device.setSpectorMetadata(this.handle, { ...this.props, data: typeof this.props.data });
-        const data = props.data;
-        // const {parameters = {}  as Record<GL, any>} = props;
-        let { width, height } = props;
+        this.device.setSpectorMetadata(this.handle, { ...this.props, data: propsWithData.data });
+        let { width, height } = propsWithData;
         if (!width || !height) {
-            const textureSize = Texture.getTextureDataSize(data);
+            const textureSize = Texture.getTextureDataSize(propsWithData.data);
             width = textureSize?.width || 1;
             height = textureSize?.height || 1;
         }
         // Store opts for accessors
         this.width = width;
         this.height = height;
-        this.depth = props.depth;
+        this.depth = propsWithData.depth;
         // Set texture sampler parameters
-        this.setSampler(props.sampler);
-        // @ts-ignore
+        this.setSampler(propsWithData.sampler);
+        // @ts-ignore TODO - fix types
         this.view = new WEBGLTextureView(this.device, { ...this.props, texture: this });
         this.bind();
-        if (!this.props.data) {
-            initializeTextureStorage(this.gl, this.mipLevels, this);
-        }
-        if (props.data) {
+        initializeTextureStorage(this.gl, this.mipLevels, this);
+        if (propsWithData.data) {
             // prettier-ignore
-            switch (props.dimension) {
+            switch (propsWithData.dimension) {
                 case '1d':
-                    this.setTexture1DData(props.data);
+                    this.setTexture1DData(propsWithData.data);
                     break;
                 case '2d':
-                    this.setTexture2DData(props.data);
+                    this.setTexture2DData(propsWithData.data);
                     break;
                 case '3d':
-                    this.setTexture3DData(props.data);
+                    this.setTexture3DData(propsWithData.data);
                     break;
                 case 'cube':
-                    this.setTextureCubeData(props.data);
+                    this.setTextureCubeData(propsWithData.data);
                     break;
                 case '2d-array':
-                    this.setTextureArrayData(props.data);
+                    this.setTextureArrayData(propsWithData.data);
                     break;
                 case 'cube-array':
-                    this.setTextureCubeArrayData(props.data);
+                    this.setTextureCubeArrayData(propsWithData.data);
                     break;
                 // @ts-expect-error
-                default: throw new Error(props.dimension);
+                default: throw new Error(propsWithData.dimension);
             }
         }
-        this.mipmaps = Boolean(props.mipmaps);
         if (this.mipmaps) {
             this.generateMipmap();
         }
-        // if (isVideo) {
-        //   this._video = {
-        //     video: data,
-        //     // TODO  - should we be using the sampler parameters here?
-        //     parameters: {},
-        //     // @ts-expect-error HTMLVideoElement.HAVE_CURRENT_DATA is not declared
-        //     lastTime: data.readyState >= HTMLVideoElement.HAVE_CURRENT_DATA ? data.currentTime : -1
-        //   };
-        // }
     }
-    /*
-    initializeCube(props?: TextureProps): void {
-      const {mipmaps = true} = props; // , parameters = {} as Record<GL, any>} = props;
-  
-      // Store props for accessors
-      // this.props = props;
-  
-      // @ts-expect-error
-      this.setCubeMapData(props).then(() => {
-        // TODO - should genMipmap() be called on the cubemap or on the faces?
-        // TODO - without generateMipmap() cube textures do not work at all!!! Why?
-        if (mipmaps) {
-          this.generateMipmap(props);
-        }
-  
-        this.setSampler(props.sampler);
-  
-        // v8 compatibility?
-        // const {parameters = {} as Record<GL, any>} = props;
-        // this._setSamplerParameters(parameters);
-      });
-    }
-    */
     destroy() {
         if (this.handle) {
             this.gl.deleteTexture(this.handle);
@@ -213,9 +132,6 @@ export class WEBGLTexture extends Texture {
             this.destroyed = true;
         }
     }
-    toString() {
-        return `Texture(${this.id},${this.width}x${this.height})`;
-    }
     createView(props) {
         return new WEBGLTextureView(this.device, { ...props, texture: this });
     }
@@ -232,50 +148,38 @@ export class WEBGLTexture extends Texture {
         const parameters = convertSamplerParametersToWebGL(samplerProps);
         this._setSamplerParameters(parameters);
     }
-    /** Update external texture (video frame or canvas) */
-    update() {
-        log.warn('Texture.update() not implemented');
-        // if (this._video) {
-        //   const {video, parameters, lastTime} = this._video;
-        //   // @ts-expect-error
-        //   if (lastTime === video.currentTime || video.readyState < HTMLVideoElement.HAVE_CURRENT_DATA) {
-        //     return;
-        //   }
-        //   this.setSubImageData({
-        //     data: video,
-        //     parameters
-        //   });
-        //   if (this.mipmaps) {
-        //     this.generateMipmap();
-        //   }
-        //   this._video.lastTime = video.currentTime;
-        // }
-    }
     // Call to regenerate mipmaps after modifying texture(s)
     generateMipmap(params = {}) {
-        if (!this.props.data) {
-            return;
+        if (!this.device.isTextureFormatRenderable(this.props.format) ||
+            !this.device.isTextureFormatFilterable(this.props.format)) {
+            log.warn(`${this} is not renderable or filterable, may not be able to generate mipmaps`)();
+        }
+        try {
+            this.gl.bindTexture(this.glTarget, this.handle);
+            withGLParameters(this.gl, params, () => {
+                this.gl.generateMipmap(this.glTarget);
+            });
+        }
+        catch (error) {
+            log.warn(`Error generating mipmap for ${this}: ${error.message}`)();
+        }
+        finally {
+            this.gl.bindTexture(this.glTarget, null);
         }
-        this.mipmaps = true;
-        this.gl.bindTexture(this.glTarget, this.handle);
-        withGLParameters(this.gl, params, () => {
-            this.gl.generateMipmap(this.glTarget);
-        });
-        this.gl.bindTexture(this.glTarget, null);
     }
     // Image Data Setters
     copyExternalImage(options) {
         const size = Texture.getExternalImageSize(options.image);
         const opts = { ...Texture.defaultCopyExternalImageOptions, ...size, ...options };
-        const { image, depth, mipLevel, x, y, z } = opts;
+        const { image, depth, mipLevel, x, y, z, flipY } = opts;
         let { width, height } = opts;
         const { dimension, glTarget, glFormat, glInternalFormat, glType } = this;
         // WebGL will error if we try to copy outside the bounds of the texture
         width = Math.min(width, size.width - x);
         height = Math.min(height, size.height - y);
-        // WebGL does not yet support sourceX/sourceY in copyExternalImage; requires copyTexSubImage2D from a framebuffer'
         if (options.sourceX || options.sourceY) {
-            throw new Error('WebGL does not yet support sourceX/sourceY in copyExternalImage; requires copyTexSubImage2D from a framebuffer');
+            // requires copyTexSubImage2D from a framebuffer'
+            throw new Error('WebGL does not support sourceX/sourceY)');
         }
         copyExternalImageToMipLevel(this.device.gl, this.handle, image, {
             dimension,
@@ -289,7 +193,8 @@ export class WEBGLTexture extends Texture {
             glFormat,
             glInternalFormat,
             glType,
-            glTarget
+            glTarget,
+            flipY
         });
         return { width: opts.width, height: opts.height };
     }
@@ -299,7 +204,7 @@ export class WEBGLTexture extends Texture {
     /** Set a simple texture */
     setTexture2DData(lodData, depth = 0) {
         this.bind();
-        const lodArray = normalizeTextureData(lodData, this);
+        const lodArray = Texture.normalizeTextureData(lodData, this);
         // If the user provides multiple LODs, then automatic mipmap
         // generation generateMipmap() should be disabled to avoid overwriting them.
         if (lodArray.length > 1 && this.props.mipmaps !== false) {
@@ -366,6 +271,11 @@ export class WEBGLTexture extends Texture {
         const faceDepth = Texture.CubeFaces.indexOf(face);
         this.setTexture2DData(lodData, faceDepth);
     }
+    // DEPRECATED METHODS
+    /** Update external texture (video frame or canvas) @deprecated Use ExternalTexture */
+    update() {
+        throw new Error('Texture.update() not implemented. Use ExternalTexture');
+    }
     // INTERNAL METHODS
     /** @todo update this method to accept LODs */
     setImageDataForFace(options) {
@@ -404,7 +314,7 @@ export class WEBGLTexture extends Texture {
      * Sets sampler parameters on texture
      */
     _setSamplerParameters(parameters) {
-        log.log(1, 'texture sampler parameters', parameters)();
+        log.log(1, `${this.id} sampler parameters`, this.device.getGLKeys(parameters))();
         this.gl.bindTexture(this.glTarget, this.handle);
         for (const [pname, pvalue] of Object.entries(parameters)) {
             const param = Number(pname);
@@ -436,61 +346,6 @@ export class WEBGLTexture extends Texture {
         }
         this.gl.bindTexture(this.glTarget, null);
     }
-    // CLASSIC
-    /*
-    setCubeMapData(options: {
-      width: number;
-      height: number;
-      data: Record<GL, Texture2DData> | Record<TextureCubeFace, Texture2DData>;
-      format?: any;
-      type?: any;
-      /** @deprecated Use .data *
-      pixels: any;
-    }): void {
-      const {gl} = this;
-  
-      const {width, height, pixels, data, format = GL.RGBA, type = GL.UNSIGNED_BYTE} = options;
-  
-      // pixel data (imageDataMap) is an Object from Face to Image or Promise.
-      // For example:
-      // {
-      // GL.TEXTURE_CUBE_MAP_POSITIVE_X : Image-or-Promise,
-      // GL.TEXTURE_CUBE_MAP_NEGATIVE_X : Image-or-Promise,
-      // ... }
-      // To provide multiple level-of-details (LODs) this can be Face to Array
-      // of Image or Promise, like this
-      // {
-      // GL.TEXTURE_CUBE_MAP_POSITIVE_X : [Image-or-Promise-LOD-0, Image-or-Promise-LOD-1],
-      // GL.TEXTURE_CUBE_MAP_NEGATIVE_X : [Image-or-Promise-LOD-0, Image-or-Promise-LOD-1],
-      // ... }
-  
-      const imageDataMap = this._getImageDataMap(pixels || data);
-  
-      const resolvedFaces = WEBGLTexture.FACES.map(face => {
-        const facePixels = imageDataMap[face];
-        return Array.isArray(facePixels) ? facePixels : [facePixels];
-      });
-      this.bind();
-  
-      WEBGLTexture.FACES.forEach((face, index) => {
-        if (resolvedFaces[index].length > 1 && this.props.mipmaps !== false) {
-          // If the user provides multiple LODs, then automatic mipmap
-          // generation generateMipmap() should be disabled to avoid overwritting them.
-          log.warn(`${this.id} has mipmap and multiple LODs.`)();
-        }
-        resolvedFaces[index].forEach((image, lodLevel) => {
-          // TODO: adjust width & height for LOD!
-          if (width && height) {
-            gl.texImage2D(face, lodLevel, format, width, height, 0 /* border*, format, type, image);
-          } else {
-            gl.texImage2D(face, lodLevel, format, format, type, image);
-          }
-        });
-      });
-  
-      this.unbind();
-    }
-    */
     // INTERNAL SETTERS
     /**
      * Copy a region of data from a CPU memory buffer into this texture.
@@ -506,7 +361,8 @@ export class WEBGLTexture extends Texture {
                 ...this,
                 depth,
                 mipLevel,
-                glTarget
+                glTarget,
+                flipY: this.props.flipY
             });
             return;
         }
@@ -545,3 +401,58 @@ export class WEBGLTexture extends Texture {
         return textureUnit;
     }
 }
+// TODO - Remove when texture refactor is complete
+/*
+setCubeMapData(options: {
+  width: number;
+  height: number;
+  data: Record<GL, Texture2DData> | Record<TextureCubeFace, Texture2DData>;
+  format?: any;
+  type?: any;
+  /** @deprecated Use .data *
+  pixels: any;
+}): void {
+  const {gl} = this;
+
+  const {width, height, pixels, data, format = GL.RGBA, type = GL.UNSIGNED_BYTE} = options;
+
+  // pixel data (imageDataMap) is an Object from Face to Image or Promise.
+  // For example:
+  // {
+  // GL.TEXTURE_CUBE_MAP_POSITIVE_X : Image-or-Promise,
+  // GL.TEXTURE_CUBE_MAP_NEGATIVE_X : Image-or-Promise,
+  // ... }
+  // To provide multiple level-of-details (LODs) this can be Face to Array
+  // of Image or Promise, like this
+  // {
+  // GL.TEXTURE_CUBE_MAP_POSITIVE_X : [Image-or-Promise-LOD-0, Image-or-Promise-LOD-1],
+  // GL.TEXTURE_CUBE_MAP_NEGATIVE_X : [Image-or-Promise-LOD-0, Image-or-Promise-LOD-1],
+  // ... }
+
+  const imageDataMap = this._getImageDataMap(pixels || data);
+
+  const resolvedFaces = WEBGLTexture.FACES.map(face => {
+    const facePixels = imageDataMap[face];
+    return Array.isArray(facePixels) ? facePixels : [facePixels];
+  });
+  this.bind();
+
+  WEBGLTexture.FACES.forEach((face, index) => {
+    if (resolvedFaces[index].length > 1 && this.props.mipmaps !== false) {
+      // If the user provides multiple LODs, then automatic mipmap
+      // generation generateMipmap() should be disabled to avoid overwritting them.
+      log.warn(`${this.id} has mipmap and multiple LODs.`)();
+    }
+    resolvedFaces[index].forEach((image, lodLevel) => {
+      // TODO: adjust width & height for LOD!
+      if (width && height) {
+        gl.texImage2D(face, lodLevel, format, width, height, 0 /* border*, format, type, image);
+      } else {
+        gl.texImage2D(face, lodLevel, format, format, type, image);
+      }
+    });
+  });
+
+  this.unbind();
+}
+*/

package/dist/adapter/webgl-adapter.js

@@ -49,7 +49,7 @@ export class WebGLAdapter extends Adapter {
         log.groupCollapsed(LOG_LEVEL, 'WebGLDevice created')();
         const promises = [];
         // Load webgl and spector debug scripts from CDN if requested
-        if (props.debugWebGL) {
+        if (props.debugWebGL || props.debug) {
             promises.push(loadWebGLDeveloperTools());
         }
         if (props.debugSpectorJS) {

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

@@ -128,7 +128,13 @@ export declare class WebGLDevice extends Device {
      * Be aware that there are some duplicates especially for constants that are 0,
      * so this isn't guaranteed to return the right key in all cases.
      */
-    getGLKey(value: unknown, gl?: WebGL2RenderingContext): string;
+    getGLKey(value: unknown, options?: {
+        emptyIfUnknown?: boolean;
+    }): string;
+    /**
+     * Returns a map with any GL.<KEY> constants mapped to strings, both for keys and values
+     */
+    getGLKeys(glParameters: Record<number, unknown>): Record<string, string>;
     /** Store constants */
     _constants: (TypedArray | null)[];
     /**

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

@@ -121,11 +121,14 @@ 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.debugWebGL) {
-            this.gl = makeDebugContext(this.gl, { ...props });
-            this.debug = true;
-            log.level = Math.max(log.level, 1);
+        const debugWebGL = props.debugWebGL || props.debug;
+        const traceWebGL = props.debugWebGL;
+        if (debugWebGL) {
+            this.gl = makeDebugContext(this.gl, { debugWebGL, traceWebGL });
             log.warn('WebGL debug mode activated. Performance reduced.')();
+            if (props.debugWebGL) {
+                log.level = Math.max(log.level, 1);
+            }
         }
     }
     /**
@@ -276,18 +279,27 @@ export class WebGLDevice extends Device {
      * Be aware that there are some duplicates especially for constants that are 0,
      * so this isn't guaranteed to return the right key in all cases.
      */
-    getGLKey(value, gl) {
-        // @ts-ignore expect-error depends on settings
-        gl = gl || this.gl2 || this.gl;
+    getGLKey(value, options) {
         const number = Number(value);
-        for (const key in gl) {
+        for (const key in this.gl) {
             // @ts-ignore expect-error depends on settings
-            if (gl[key] === number) {
+            if (this.gl[key] === number) {
                 return `GL.${key}`;
             }
         }
         // No constant found. Stringify the value and return it.
-        return String(value);
+        return options?.emptyIfUnknown ? '' : String(value);
+    }
+    /**
+     * Returns a map with any GL.<KEY> constants mapped to strings, both for keys and values
+     */
+    getGLKeys(glParameters) {
+        const opts = { emptyIfUnknown: true };
+        return Object.entries(glParameters).reduce((keys, [key, value]) => {
+            // eslint-disable-next-line @typescript-eslint/no-base-to-string
+            keys[`${key}:${this.getGLKey(key, opts)}`] = `${value}:${this.getGLKey(value, opts)}`;
+            return keys;
+        }, {});
     }
     /** Store constants */
     _constants;

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

@@ -1,5 +1,6 @@
 type DebugContextProps = {
     debugWebGL?: boolean;
+    traceWebGL?: 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,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"}
+{"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;IACrB,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.debugWebGL ? getDebugContext(gl, props) : getRealContext(gl);
+    return props.debugWebGL || props.traceWebGL ? getDebugContext(gl, props) : getRealContext(gl);
 }
 // Returns the real context from either of the real/debug contexts
 function getRealContext(gl) {
@@ -95,7 +95,9 @@ function onValidateGLFunc(props, functionName, functionArgs) {
     let functionString = '';
     if (log.level >= 1) {
         functionString = getFunctionString(functionName, functionArgs);
-        log.log(1, functionString)();
+        if (props.traceWebGL) {
+            log.log(1, functionString)();
+        }
     }
     for (const arg of functionArgs) {
         if (arg === undefined) {

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;;;;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"}
+{"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,CA4DxB"}

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

@@ -8,7 +8,7 @@
  */
 export function createBrowserContext(canvas, props, webglContextAttributes) {
     // Try to extract any extra information about why context creation failed
-    const errorMessage = null;
+    let errorMessage = '';
     // const onCreateError = error => (errorMessage = error.statusMessage || errorMessage);
     // Avoid multiple listeners?
     // canvas.removeEventListener('webglcontextcreationerror', onCreateError, false);
@@ -22,22 +22,36 @@ export function createBrowserContext(canvas, props, webglContextAttributes) {
     let gl = null;
     // Create a webgl2 context
     gl ||= canvas.getContext('webgl2', webglProps);
+    if (webglProps.failIfMajorPerformanceCaveat) {
+        errorMessage ||=
+            'Only software GPU is available. Set `failIfMajorPerformanceCaveat: false` to allow.';
+    }
     // Creation failed with failIfMajorPerformanceCaveat - Try a Software GPU
     if (!gl && !webglContextAttributes.failIfMajorPerformanceCaveat) {
         webglProps.failIfMajorPerformanceCaveat = false;
-        gl = canvas.getContext('webgl', webglProps);
+        gl = canvas.getContext('webgl2', 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'}`);
+        gl = canvas.getContext('webgl', {});
+        if (gl) {
+            gl = null;
+            errorMessage ||= 'Your browser only supports WebGL1';
+        }
+    }
+    if (!gl) {
+        errorMessage ||= 'Your browser does not support WebGL';
+        throw new Error(`Failed to create WebGL context: ${errorMessage}`);
     }
     // 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);
+    // @ts-expect-error
+    gl.luma ||= {};
     return gl;
 }
 /* TODO - can we call this asynchronously to catch the error events?