@luma.gl/webgl 9.1.0-alpha.1 → 9.1.0-alpha.12

package/dist/index.cjs

@@ -2,7 +2,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,10 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 
 // dist/index.js
 var dist_exports = {};
@@ -37,22 +32,24 @@ __export(dist_exports, {
   WEBGLVertexArray: () => WEBGLVertexArray,
   WebGLCanvasContext: () => WebGLCanvasContext,
   WebGLDevice: () => WebGLDevice,
+  WebGLStateTracker: () => WebGLStateTracker,
   _TEXTURE_FORMATS: () => TEXTURE_FORMATS,
   getGLParameters: () => getGLParameters,
   getShaderLayout: () => getShaderLayout,
-  popContextState: () => popContextState,
-  pushContextState: () => pushContextState,
   resetGLParameters: () => resetGLParameters,
   setDeviceParameters: () => setDeviceParameters,
   setGLParameters: () => setGLParameters,
-  trackContextState: () => trackContextState,
+  webgl2Adapter: () => webgl2Adapter,
   withDeviceParameters: () => withDeviceParameters,
   withGLParameters: () => withGLParameters
 });
 module.exports = __toCommonJS(dist_exports);
 
+// dist/adapter/webgl-adapter.js
+var import_core24 = require("@luma.gl/core");
+
 // dist/adapter/webgl-device.js
-var import_core22 = require("@luma.gl/core");
+var import_core23 = require("@luma.gl/core");
 
 // dist/context/parameters/webgl-parameter-tables.js
 var import_constants = require("@luma.gl/constants");
@@ -594,24 +591,22 @@ function deepArrayEqual(x, y) {
   return false;
 }
 
-// dist/context/state-tracker/track-context-state.js
-var GLState = class {
+// dist/context/state-tracker/webgl-state-tracker.js
+var WebGLStateTracker = class {
+  static get(gl) {
+    return gl.state;
+  }
   gl;
   program = null;
   stateStack = [];
   enable = true;
-  cache;
+  cache = null;
   log;
-  constructor(gl, {
-    copyState = false,
-    // Copy cache from params (slow) or initialize from WebGL defaults (fast)
-    log: log9 = () => {
-    }
-    // Logging function, called when gl parameter change calls are actually issued
-  } = {}) {
+  initialized = false;
+  constructor(gl, props) {
     this.gl = gl;
-    this.cache = copyState ? getGLParameters(gl) : Object.assign({}, GL_PARAMETER_DEFAULTS);
-    this.log = log9;
+    this.log = (props == null ? void 0 : props.log) || (() => {
+    });
     this._updateCache = this._updateCache.bind(this);
     Object.seal(this);
   }
@@ -623,6 +618,29 @@ var GLState = class {
     setGLParameters(this.gl, oldValues);
     this.stateStack.pop();
   }
+  /**
+   * Initialize WebGL state caching on a context
+   * can be called multiple times to enable/disable
+   *
+   * @note After calling this function, context state will be cached
+   * .push() and .pop() will be available for saving,
+   * temporarily modifying, and then restoring state.
+   */
+  trackState(gl, options) {
+    this.cache = options.copyState ? getGLParameters(gl) : Object.assign({}, GL_PARAMETER_DEFAULTS);
+    if (this.initialized) {
+      throw new Error("WebGLStateTracker");
+    }
+    this.initialized = true;
+    this.gl.state = this;
+    installProgramSpy(gl);
+    for (const key in GL_HOOKED_SETTERS) {
+      const setter = GL_HOOKED_SETTERS[key];
+      installSetterSpy(gl, key, setter);
+    }
+    installGetterOverride(gl, "getParameter");
+    installGetterOverride(gl, "isEnabled");
+  }
   /**
   // interceptor for context set functions - update our cache and our stack
   // values (Object) - the key values for this setter
@@ -648,44 +666,13 @@ var GLState = class {
     return { valueChanged, oldValue };
   }
 };
-function getContextState(gl) {
-  return gl.state;
-}
-function trackContextState(gl, options) {
-  const { enable: enable2 = true, copyState } = options || {};
-  if (!gl.state) {
-    gl.state = new GLState(gl, { copyState });
-    installProgramSpy(gl);
-    for (const key in GL_HOOKED_SETTERS) {
-      const setter = GL_HOOKED_SETTERS[key];
-      installSetterSpy(gl, key, setter);
-    }
-    installGetterOverride(gl, "getParameter");
-    installGetterOverride(gl, "isEnabled");
-  }
-  const glState = getContextState(gl);
-  glState.enable = enable2;
-  return gl;
-}
-function pushContextState(gl) {
-  let glState = getContextState(gl);
-  if (!glState) {
-    trackContextState(gl, { copyState: false });
-    glState = getContextState(gl);
-  }
-  glState.push();
-}
-function popContextState(gl) {
-  const glState = getContextState(gl);
-  glState.pop();
-}
 function installGetterOverride(gl, functionName) {
   const originalGetterFunc = gl[functionName].bind(gl);
   gl[functionName] = function get(pname) {
     if (pname === void 0 || NON_CACHE_PARAMETERS.has(pname)) {
       return originalGetterFunc(pname);
     }
-    const glState = getContextState(gl);
+    const glState = WebGLStateTracker.get(gl);
     if (!(pname in glState.cache)) {
       glState.cache[pname] = originalGetterFunc(pname);
     }
@@ -708,7 +695,7 @@ function installSetterSpy(gl, functionName, setter) {
   }
   const originalSetterFunc = gl[functionName].bind(gl);
   gl[functionName] = function set(...params) {
-    const glState = getContextState(gl);
+    const glState = WebGLStateTracker.get(gl);
     const { valueChanged, oldValue } = setter(glState._updateCache, ...params);
     if (valueChanged) {
       originalSetterFunc(...params);
@@ -723,7 +710,7 @@ function installSetterSpy(gl, functionName, setter) {
 function installProgramSpy(gl) {
   const originalUseProgram = gl.useProgram.bind(gl);
   gl.useProgram = function useProgramLuma(handle) {
-    const glState = getContextState(gl);
+    const glState = WebGLStateTracker.get(gl);
     if (glState.program !== handle) {
       originalUseProgram(handle);
       glState.program = handle;
@@ -941,26 +928,6 @@ function checkTextureFeature(gl, feature, extensions) {
   return textureExtensions.every((extension) => getWebGLExtension(gl, extension, extensions));
 }
 var TEXTURE_FORMATS = {
-  // Unsized formats that leave the precision up to the driver. TODO - Fix bpp constants
-  "rgb8unorm-unsized": {
-    gl: 6407,
-    b: 4,
-    c: 2,
-    bpp: 4,
-    dataFormat: 6407,
-    types: [5121, 33635]
-  },
-  "rgba8unorm-unsized": {
-    gl: 6408,
-    b: 4,
-    c: 2,
-    bpp: 4,
-    dataFormat: 6408,
-    types: [5121, 32819, 32820]
-  },
-  // 'r8unorm-unsized': {gl: GL.LUMINANCE, b: 4, c: 2, bpp: 4},
-  // 'rgb8unorm-srgb-unsized': {gl: GL.SRGB_EXT, b: 4, c: 2, bpp: 4, gl1Ext: SRGB},
-  // 'rgba8unorm-srgb-unsized': {gl: GL.SRGB_ALPHA_EXT, b: 4, c: 2, bpp: 4, gl1Ext: SRGB},
   // 8-bit formats
   "r8unorm": { gl: 33321, b: 1, c: 1, rb: true },
   "r8snorm": { gl: 36756, b: 1, c: 1, render: snorm8_renderable },
@@ -1075,17 +1042,6 @@ var TEXTURE_FORMATS = {
     dataFormat: 34041,
     types: [34042]
   },
-  // "depth24unorm-stencil8" feature
-  "depth24unorm-stencil8": {
-    gl: 35056,
-    b: 4,
-    c: 2,
-    p: 1,
-    attachment: 33306,
-    dataFormat: 34041,
-    types: [34042],
-    rb: true
-  },
   // "depth32float-stencil8" feature - TODO below is render buffer only?
   "depth32float-stencil8": {
     gl: 36013,
@@ -1175,6 +1131,10 @@ function isTextureFormatSupported(gl, format, extensions) {
   if (info.gl === void 0) {
     return false;
   }
+  const feature = info.f;
+  if (feature) {
+    return checkTextureFeature(gl, feature, extensions);
+  }
   const extension = info.x || info.gl2ext;
   if (extension) {
     return Boolean(getWebGLExtension(gl, extension, extensions));
@@ -1220,11 +1180,10 @@ function getTextureFormatWebGL(format) {
   const decoded = (0, import_core.decodeTextureFormat)(format);
   return {
     internalFormat: webglFormat,
-    format: (formatData == null ? void 0 : formatData.dataFormat) || getWebGLPixelDataFormat(decoded.format, decoded.integer, decoded.normalized, webglFormat),
+    format: (formatData == null ? void 0 : formatData.dataFormat) || getWebGLPixelDataFormat(decoded.channels, decoded.integer, decoded.normalized, webglFormat),
     // depth formats don't have a type
     type: decoded.dataType ? getGLFromVertexType(decoded.dataType) : ((_a = formatData == null ? void 0 : formatData.types) == null ? void 0 : _a[0]) || 5121,
-    // @ts-expect-error
-    compressed: decoded.compressed
+    compressed: decoded.compressed || false
   };
 }
 function getDepthStencilAttachmentWebGL(format) {
@@ -1234,11 +1193,11 @@ function getDepthStencilAttachmentWebGL(format) {
   }
   return info.attachment;
 }
-function getWebGLPixelDataFormat(dataFormat, integer, normalized, format) {
+function getWebGLPixelDataFormat(channels, integer, normalized, format) {
   if (format === 6408 || format === 6407) {
     return format;
   }
-  switch (dataFormat) {
+  switch (channels) {
     case "r":
       return integer && !normalized ? 36244 : 6403;
     case "rg":
@@ -1247,6 +1206,8 @@ function getWebGLPixelDataFormat(dataFormat, integer, normalized, format) {
       return integer && !normalized ? 36248 : 6407;
     case "rgba":
       return integer && !normalized ? 36249 : 6408;
+    case "bgra":
+      throw new Error("bgra pixels not supported by WebGL");
     default:
       return 6408;
   }
@@ -1268,7 +1229,6 @@ var WEBGL_FEATURES = {
   // 'timestamp-query' // GPUQueryType "timestamp-query"
   // "indirect-first-instance"
   // Textures are handled by getTextureFeatures()
-  // 'depth24unorm-stencil8' // GPUTextureFormat 'depth24unorm-stencil8'
   // 'depth32float-stencil8' // GPUTextureFormat 'depth32float-stencil8'
   // optional WebGL features
   "timer-query-webgl": "EXT_disjoint_timer_query_webgl2",
@@ -1446,15 +1406,15 @@ var WebGLDeviceLimits = class extends import_core3.DeviceLimits {
 };
 
 // dist/adapter/webgl-canvas-context.js
-var import_core9 = require("@luma.gl/core");
+var import_core10 = require("@luma.gl/core");
 
 // dist/adapter/resources/webgl-framebuffer.js
-var import_core8 = require("@luma.gl/core");
-var import_constants11 = require("@luma.gl/constants");
+var import_core9 = require("@luma.gl/core");
+var import_constants13 = require("@luma.gl/constants");
 
 // dist/adapter/resources/webgl-texture.js
-var import_core7 = require("@luma.gl/core");
-var import_constants10 = require("@luma.gl/constants");
+var import_core8 = require("@luma.gl/core");
+var import_constants12 = require("@luma.gl/constants");
 
 // dist/context/state-tracker/with-parameters.js
 function withGLParameters(gl, parameters, func) {
@@ -1462,17 +1422,18 @@ function withGLParameters(gl, parameters, func) {
     return func(gl);
   }
   const { nocatch = true } = parameters;
-  pushContextState(gl);
+  const webglState = WebGLStateTracker.get(gl);
+  webglState.push();
   setGLParameters(gl, parameters);
   let value;
   if (nocatch) {
     value = func(gl);
-    popContextState(gl);
+    webglState.pop();
   } else {
     try {
       value = func(gl);
     } finally {
-      popContextState(gl);
+      webglState.pop();
     }
   }
   return value;
@@ -1495,25 +1456,26 @@ function withDeviceAndGLParameters(device, parameters, glParameters, func) {
     return func(device);
   }
   const webglDevice = device;
-  pushContextState(webglDevice.gl);
+  webglDevice.pushState();
   try {
     setDeviceParameters(device, parameters);
     setGLParameters(webglDevice.gl, glParameters);
     return func(device);
   } finally {
-    popContextState(webglDevice.gl);
+    webglDevice.popState();
   }
 }
 function withDeviceParameters(device, parameters, func) {
   if (isObjectEmpty3(parameters)) {
     return func(device);
   }
-  pushContextState(device.gl);
+  const webglDevice = device;
+  webglDevice.pushState();
   try {
     setDeviceParameters(device, parameters);
     return func(device);
   } finally {
-    popContextState(device.gl);
+    webglDevice.popState();
   }
 }
 function setDeviceParameters(device, parameters) {
@@ -1632,8 +1594,16 @@ function setDeviceParameters(device, parameters) {
     gl.stencilOpSeparate(1028, sfail, dpfail, dppass);
     gl.stencilOpSeparate(1029, sfail, dpfail, dppass);
   }
+  switch (parameters.blend) {
+    case true:
+      gl.enable(3042);
+      break;
+    case false:
+      gl.disable(3042);
+      break;
+    default:
+  }
   if (parameters.blendColorOperation || parameters.blendAlphaOperation) {
-    gl.enable(3042);
     const colorEquation = convertBlendOperationToEquation("blendColorOperation", parameters.blendColorOperation || "add");
     const alphaEquation = convertBlendOperationToEquation("blendAlphaOperation", parameters.blendAlphaOperation || "add");
     gl.blendEquationSeparate(colorEquation, alphaEquation);
@@ -1840,7 +1810,97 @@ var WEBGLTextureView = class extends import_core6.TextureView {
 };
 
 // dist/adapter/helpers/webgl-texture-utils.js
+var import_core7 = require("@luma.gl/core");
+var import_constants11 = require("@luma.gl/constants");
+
+// dist/adapter/helpers/typed-array-utils.js
 var import_constants9 = require("@luma.gl/constants");
+var ERR_TYPE_DEDUCTION = "Failed to deduce GL constant from typed array";
+function getGLTypeFromTypedArray(arrayOrType) {
+  const type = ArrayBuffer.isView(arrayOrType) ? arrayOrType.constructor : arrayOrType;
+  switch (type) {
+    case Float32Array:
+      return 5126;
+    case Uint16Array:
+      return 5123;
+    case Uint32Array:
+      return 5125;
+    case Uint8Array:
+      return 5121;
+    case Uint8ClampedArray:
+      return 5121;
+    case Int8Array:
+      return 5120;
+    case Int16Array:
+      return 5122;
+    case Int32Array:
+      return 5124;
+    default:
+      throw new Error(ERR_TYPE_DEDUCTION);
+  }
+}
+function getTypedArrayFromGLType(glType, options) {
+  const { clamped = true } = options || {};
+  switch (glType) {
+    case 5126:
+      return Float32Array;
+    case 5123:
+    case 33635:
+    case 32819:
+    case 32820:
+      return Uint16Array;
+    case 5125:
+      return Uint32Array;
+    case 5121:
+      return clamped ? Uint8ClampedArray : Uint8Array;
+    case 5120:
+      return Int8Array;
+    case 5122:
+      return Int16Array;
+    case 5124:
+      return Int32Array;
+    default:
+      throw new Error("Failed to deduce typed array type from GL constant");
+  }
+}
+
+// dist/adapter/helpers/format-utils.js
+var import_constants10 = require("@luma.gl/constants");
+function glFormatToComponents(format) {
+  switch (format) {
+    case 6406:
+    case 33326:
+    case 6403:
+      return 1;
+    case 33328:
+    case 33319:
+      return 2;
+    case 6407:
+    case 34837:
+      return 3;
+    case 6408:
+    case 34836:
+      return 4;
+    default:
+      return 0;
+  }
+}
+function glTypeToBytes(type) {
+  switch (type) {
+    case 5121:
+      return 1;
+    case 33635:
+    case 32819:
+    case 32820:
+      return 2;
+    case 5126:
+      return 4;
+    default:
+      return 0;
+  }
+}
+
+// dist/adapter/helpers/webgl-texture-utils.js
 function initializeTextureStorage(gl, levels, options) {
   const { dimension, width, height, depth = 0 } = options;
   const { glInternalFormat } = options;
@@ -1854,44 +1914,49 @@ function initializeTextureStorage(gl, levels, options) {
       gl.texStorage2D(glTarget, levels, glInternalFormat, width, height);
   }
 }
-function copyCPUImageToMipLevel(gl, image, options) {
-  const { dimension, width, height, depth = 0, level = 0 } = options;
+function copyExternalImageToMipLevel(gl, handle, image, options) {
+  const { width, height } = options;
+  const { dimension, depth = 0, mipLevel = 0 } = options;
   const { x = 0, y = 0, z = 0 } = options;
   const { glFormat, glType } = options;
-  const glTarget = getCubeTargetWebGL(options.glTarget, dimension, depth);
+  const glTarget = getWebGLCubeFaceTarget(options.glTarget, dimension, depth);
   switch (dimension) {
     case "2d-array":
     case "3d":
-      gl.texSubImage3D(glTarget, level, x, y, z, width, height, depth, glFormat, glType, image);
+      gl.bindTexture(glTarget, handle);
+      gl.texSubImage3D(glTarget, mipLevel, x, y, z, width, height, depth, glFormat, glType, image);
+      gl.bindTexture(glTarget, null);
       break;
     case "2d":
     case "cube":
-      gl.texSubImage2D(glTarget, level, x, y, width, height, glFormat, glType, image);
+      gl.bindTexture(glTarget, handle);
+      gl.texSubImage2D(glTarget, mipLevel, x, y, width, height, glFormat, glType, image);
+      gl.bindTexture(glTarget, null);
       break;
     default:
       throw new Error(dimension);
   }
 }
 function copyCPUDataToMipLevel(gl, typedArray, options) {
-  const { dimension, width, height, depth = 0, level = 0, byteOffset = 0 } = options;
+  const { dimension, width, height, depth = 0, mipLevel = 0, byteOffset = 0 } = options;
   const { x = 0, y = 0, z = 0 } = options;
   const { glFormat, glType, compressed } = options;
-  const glTarget = getCubeTargetWebGL(options.glTarget, dimension, depth);
+  const glTarget = getWebGLCubeFaceTarget(options.glTarget, dimension, depth);
   switch (dimension) {
     case "2d-array":
     case "3d":
       if (compressed) {
-        gl.compressedTexSubImage3D(glTarget, level, x, y, z, width, height, depth, glFormat, typedArray, byteOffset);
+        gl.compressedTexSubImage3D(glTarget, mipLevel, x, y, z, width, height, depth, glFormat, typedArray, byteOffset);
       } else {
-        gl.texSubImage3D(glTarget, level, x, y, z, width, height, depth, glFormat, glType, typedArray, byteOffset);
+        gl.texSubImage3D(glTarget, mipLevel, x, y, z, width, height, depth, glFormat, glType, typedArray, byteOffset);
       }
       break;
     case "2d":
     case "cube":
       if (compressed) {
-        gl.compressedTexSubImage2D(glTarget, level, x, y, width, height, glFormat, typedArray, byteOffset);
+        gl.compressedTexSubImage2D(glTarget, mipLevel, x, y, width, height, glFormat, typedArray, byteOffset);
       } else {
-        gl.texSubImage2D(glTarget, level, x, y, width, height, glFormat, glType, typedArray, byteOffset);
+        gl.texSubImage2D(glTarget, mipLevel, x, y, width, height, glFormat, glType, typedArray, byteOffset);
       }
       break;
     default:
@@ -1915,9 +1980,100 @@ function getWebGLTextureTarget(dimension) {
   }
   throw new Error(dimension);
 }
-function getCubeTargetWebGL(glTarget, dimension, level) {
+function getWebGLCubeFaceTarget(glTarget, dimension, level) {
   return dimension === "cube" ? 34069 + level : glTarget;
 }
+function readPixelsToArray(source, options) {
+  var _a, _b, _c, _d, _e, _f;
+  const {
+    sourceX = 0,
+    sourceY = 0,
+    sourceAttachment = 36064
+    // TODO - support gl.readBuffer
+  } = options || {};
+  let {
+    target = null,
+    // following parameters are auto deduced if not provided
+    sourceWidth,
+    sourceHeight,
+    sourceDepth,
+    sourceFormat,
+    sourceType
+  } = options || {};
+  const { framebuffer, deleteFramebuffer } = getFramebuffer(source);
+  const { gl, handle } = framebuffer;
+  const attachment = sourceAttachment - 36064;
+  sourceWidth ||= framebuffer.width;
+  sourceHeight ||= framebuffer.height;
+  sourceDepth = ((_b = (_a = framebuffer.colorAttachments[attachment]) == null ? void 0 : _a.texture) == null ? void 0 : _b.depth) || 1;
+  sourceFormat ||= ((_d = (_c = framebuffer.colorAttachments[attachment]) == null ? void 0 : _c.texture) == null ? void 0 : _d.glFormat) || 6408;
+  sourceType ||= ((_f = (_e = framebuffer.colorAttachments[attachment]) == null ? void 0 : _e.texture) == null ? void 0 : _f.glType) || 5121;
+  target = getPixelArray(target, sourceType, sourceFormat, sourceWidth, sourceHeight, sourceDepth);
+  sourceType = sourceType || getGLTypeFromTypedArray(target);
+  const prevHandle = gl.bindFramebuffer(36160, handle);
+  gl.readPixels(sourceX, sourceY, sourceWidth, sourceHeight, sourceFormat, sourceType, target);
+  gl.bindFramebuffer(36160, prevHandle || null);
+  if (deleteFramebuffer) {
+    framebuffer.destroy();
+  }
+  return target;
+}
+function readPixelsToBuffer(source, options) {
+  const { target, sourceX = 0, sourceY = 0, sourceFormat = 6408, targetByteOffset = 0 } = options || {};
+  let { sourceWidth, sourceHeight, sourceType } = options || {};
+  const { framebuffer, deleteFramebuffer } = getFramebuffer(source);
+  sourceWidth = sourceWidth || framebuffer.width;
+  sourceHeight = sourceHeight || framebuffer.height;
+  const webglFramebuffer = framebuffer;
+  sourceType = sourceType || 5121;
+  let webglBufferTarget = target;
+  if (!webglBufferTarget) {
+    const components = glFormatToComponents(sourceFormat);
+    const byteCount = glTypeToBytes(sourceType);
+    const byteLength = targetByteOffset + sourceWidth * sourceHeight * components * byteCount;
+    webglBufferTarget = webglFramebuffer.device.createBuffer({ byteLength });
+  }
+  const commandEncoder = source.device.createCommandEncoder();
+  commandEncoder.copyTextureToBuffer({
+    source,
+    width: sourceWidth,
+    height: sourceHeight,
+    origin: [sourceX, sourceY],
+    destination: webglBufferTarget,
+    byteOffset: targetByteOffset
+  });
+  commandEncoder.destroy();
+  if (deleteFramebuffer) {
+    framebuffer.destroy();
+  }
+  return webglBufferTarget;
+}
+function getFramebuffer(source) {
+  if (!(source instanceof import_core7.Framebuffer)) {
+    return { framebuffer: toFramebuffer(source), deleteFramebuffer: true };
+  }
+  return { framebuffer: source, deleteFramebuffer: false };
+}
+function toFramebuffer(texture, props) {
+  const { device, width, height, id } = texture;
+  const framebuffer = device.createFramebuffer({
+    ...props,
+    id: `framebuffer-for-${id}`,
+    width,
+    height,
+    colorAttachments: [texture]
+  });
+  return framebuffer;
+}
+function getPixelArray(pixelArray, type, format, width, height, depth) {
+  if (pixelArray) {
+    return pixelArray;
+  }
+  type = type || 5121;
+  const ArrayType = getTypedArrayFromGLType(type, { clamped: false });
+  const components = glFormatToComponents(format);
+  return new ArrayType(width * height * components);
+}
 
 // dist/adapter/resources/webgl-texture.js
 function normalizeTextureData(data, options) {
@@ -1939,7 +2095,7 @@ function normalizeTextureData(data, options) {
   }
   return lodArray;
 }
-var WEBGLTexture = class extends import_core7.Texture {
+var WEBGLTexture = class extends import_core8.Texture {
   MAX_ATTRIBUTES;
   device;
   gl;
@@ -1980,7 +2136,7 @@ var WEBGLTexture = class extends import_core7.Texture {
   /** For automatically updating video */
   _video = null;
   constructor(device, props) {
-    super(device, { ...import_core7.Texture.defaultProps, ...props, data: void 0 });
+    super(device, { ...import_core8.Texture.defaultProps, ...props, data: void 0 });
     this.device = device;
     this.gl = this.device.gl;
     this.glTarget = getWebGLTextureTarget(this.props.dimension);
@@ -2008,7 +2164,7 @@ var WEBGLTexture = class extends import_core7.Texture {
     const data = props.data;
     let { width, height } = props;
     if (!width || !height) {
-      const textureSize = this.getTextureDataSize(data);
+      const textureSize = import_core8.Texture.getTextureDataSize(data);
       width = (textureSize == null ? void 0 : textureSize.width) || 1;
       height = (textureSize == null ? void 0 : textureSize.height) || 1;
     }
@@ -2101,7 +2257,7 @@ var WEBGLTexture = class extends import_core7.Texture {
   }
   /** Update external texture (video frame or canvas) */
   update() {
-    import_core7.log.warn("Texture.update() not implemented");
+    import_core8.log.warn("Texture.update() not implemented");
   }
   // Call to regenerate mipmaps after modifying texture(s)
   generateMipmap(params = {}) {
@@ -2116,15 +2272,42 @@ var WEBGLTexture = class extends import_core7.Texture {
     this.gl.bindTexture(this.glTarget, null);
   }
   // Image Data Setters
+  copyExternalImage(options) {
+    const size = import_core8.Texture.getExternalImageSize(options.image);
+    const opts = { ...import_core8.Texture.defaultCopyExternalImageOptions, ...size, ...options };
+    const { image, depth, mipLevel, x, y, z } = opts;
+    let { width, height } = opts;
+    const { dimension, glTarget, glFormat, glInternalFormat, glType } = this;
+    width = Math.min(width, size.width - x);
+    height = Math.min(height, size.height - y);
+    if (options.sourceX || options.sourceY) {
+      throw new Error("WebGL does not yet support sourceX/sourceY in copyExternalImage; requires copyTexSubImage2D from a framebuffer");
+    }
+    copyExternalImageToMipLevel(this.device.gl, this.handle, image, {
+      dimension,
+      mipLevel,
+      x,
+      y,
+      z,
+      width,
+      height,
+      depth,
+      glFormat,
+      glInternalFormat,
+      glType,
+      glTarget
+    });
+    return { width: opts.width, height: opts.height };
+  }
   setTexture1DData(data) {
     throw new Error("setTexture1DData not supported in WebGL.");
   }
   /** Set a simple texture */
-  setTexture2DData(lodData, depth = 0, glTarget = this.glTarget) {
+  setTexture2DData(lodData, depth = 0) {
     this.bind();
     const lodArray = normalizeTextureData(lodData, this);
     if (lodArray.length > 1 && this.props.mipmaps !== false) {
-      import_core7.log.warn(`Texture ${this.id} mipmap and multiple LODs.`)();
+      import_core8.log.warn(`Texture ${this.id} mipmap and multiple LODs.`)();
     }
     for (let lodLevel = 0; lodLevel < lodArray.length; lodLevel++) {
       const imageData = lodArray[lodLevel];
@@ -2141,7 +2324,9 @@ var WEBGLTexture = class extends import_core7.Texture {
       throw new Error(this.id);
     }
     if (ArrayBuffer.isView(data)) {
+      this.bind();
       copyCPUDataToMipLevel(this.device.gl, data, this);
+      this.unbind();
     }
   }
   /**
@@ -2154,6 +2339,9 @@ var WEBGLTexture = class extends import_core7.Texture {
     if (this.props.dimension !== "cube") {
       throw new Error(this.id);
     }
+    for (const face of import_core8.Texture.CubeFaces) {
+      this.setTextureCubeFaceData(data[face], face);
+    }
   }
   /**
    * Sets an entire texture array
@@ -2174,10 +2362,10 @@ var WEBGLTexture = class extends import_core7.Texture {
   }
   setTextureCubeFaceData(lodData, face, depth = 0) {
     if (Array.isArray(lodData) && lodData.length > 1 && this.props.mipmaps !== false) {
-      import_core7.log.warn(`${this.id} has mipmap and multiple LODs.`)();
+      import_core8.log.warn(`${this.id} has mipmap and multiple LODs.`)();
     }
-    this.bind();
-    this.unbind();
+    const faceDepth = import_core8.Texture.CubeFaces.indexOf(face);
+    this.setTexture2DData(lodData, faceDepth);
   }
   // INTERNAL METHODS
   /** @todo update this method to accept LODs */
@@ -2208,8 +2396,8 @@ var WEBGLTexture = class extends import_core7.Texture {
     }
   }
   _getImageDataMap(faceData) {
-    for (let i = 0; i < import_core7.Texture.CubeFaces.length; ++i) {
-      const faceName = import_core7.Texture.CubeFaces[i];
+    for (let i = 0; i < import_core8.Texture.CubeFaces.length; ++i) {
+      const faceName = import_core8.Texture.CubeFaces[i];
       if (faceData[faceName]) {
         faceData[34069 + i] = faceData[faceName];
         delete faceData[faceName];
@@ -2222,7 +2410,7 @@ var WEBGLTexture = class extends import_core7.Texture {
    * Sets sampler parameters on texture
    */
   _setSamplerParameters(parameters) {
-    import_core7.log.log(1, "texture sampler parameters", parameters)();
+    import_core8.log.log(1, "texture sampler parameters", parameters)();
     this.gl.bindTexture(this.glTarget, this.handle);
     for (const [pname, pvalue] of Object.entries(parameters)) {
       const param = Number(pname);
@@ -2311,16 +2499,22 @@ var WEBGLTexture = class extends import_core7.Texture {
    * Copy a region of data from a CPU memory buffer into this texture.
    * @todo -   GLUnpackParameters parameters
    */
-  _setMipLevel(depth, level, textureData, offset = 0) {
-    if (import_core7.Texture.isExternalImage(textureData)) {
-      copyCPUImageToMipLevel(this.device.gl, textureData, { ...this, depth, level });
+  _setMipLevel(depth, mipLevel, textureData, glTarget = this.glTarget) {
+    if (import_core8.Texture.isExternalImage(textureData)) {
+      copyExternalImageToMipLevel(this.device.gl, this.handle, textureData, {
+        ...this,
+        depth,
+        mipLevel,
+        glTarget
+      });
       return;
     }
-    if (this.isTextureLevelData(textureData)) {
+    if (import_core8.Texture.isTextureLevelData(textureData)) {
       copyCPUDataToMipLevel(this.device.gl, textureData.data, {
         ...this,
         depth,
-        level
+        mipLevel,
+        glTarget
       });
       return;
     }
@@ -2351,7 +2545,7 @@ var WEBGLTexture = class extends import_core7.Texture {
 };
 
 // dist/adapter/resources/webgl-framebuffer.js
-var WEBGLFramebuffer = class extends import_core8.Framebuffer {
+var WEBGLFramebuffer = class extends import_core9.Framebuffer {
   device;
   gl;
   handle;
@@ -2453,7 +2647,7 @@ var WEBGLFramebuffer = class extends import_core8.Framebuffer {
     switch (texture.glTarget) {
       case 35866:
       case 32879:
-        gl.framebufferTextureLayer(36160, attachment, texture.glTarget, level, layer);
+        gl.framebufferTextureLayer(36160, attachment, texture.handle, level, layer);
         break;
       case 34067:
         const face = mapIndexToCubeMapFace(layer);
@@ -2491,7 +2685,7 @@ function _getFrameBufferStatus(status) {
 }
 
 // dist/adapter/webgl-canvas-context.js
-var WebGLCanvasContext = class extends import_core9.CanvasContext {
+var WebGLCanvasContext = class extends import_core10.CanvasContext {
   device;
   format = "rgba8unorm";
   depthStencilFormat = "depth24plus";
@@ -2544,7 +2738,7 @@ var WebGLCanvasContext = class extends import_core9.CanvasContext {
 };
 
 // dist/context/debug/spector.js
-var import_core10 = require("@luma.gl/core");
+var import_core11 = require("@luma.gl/core");
 
 // dist/utils/load-script.js
 async function loadScript(scriptUrl, scriptId) {
@@ -2566,30 +2760,36 @@ async function loadScript(scriptUrl, scriptId) {
 }
 
 // dist/context/debug/spector.js
-var DEFAULT_SPECTOR_PROPS = {
-  spector: import_core10.log.get("spector") || import_core10.log.get("inspect")
-};
-var SPECTOR_CDN_URL = "https://spectorcdn.babylonjs.com/spector.bundle.js";
 var LOG_LEVEL = 1;
 var spector = null;
 var initialized = false;
+var DEFAULT_SPECTOR_PROPS = {
+  debugWithSpectorJS: import_core11.log.get("spector") || import_core11.log.get("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",
+  gl: void 0
+};
 async function loadSpectorJS(props) {
   if (!globalThis.SPECTOR) {
     try {
-      await loadScript(SPECTOR_CDN_URL);
+      await loadScript(props.spectorUrl || DEFAULT_SPECTOR_PROPS.spectorUrl);
     } catch (error) {
-      import_core10.log.warn(String(error));
+      import_core11.log.warn(String(error));
     }
   }
 }
 function initializeSpectorJS(props) {
+  var _a;
   props = { ...DEFAULT_SPECTOR_PROPS, ...props };
-  if (!(props == null ? void 0 : props.spector)) {
+  if (!props.debugWithSpectorJS) {
     return null;
   }
-  if (!spector && globalThis.SPECTOR) {
-    import_core10.log.probe(LOG_LEVEL, "SPECTOR found and initialized")();
-    spector = new globalThis.SPECTOR.Spector();
+  if (!spector && globalThis.SPECTOR && !((_a = globalThis.luma) == null ? void 0 : _a.spector)) {
+    import_core11.log.probe(LOG_LEVEL, "SPECTOR found and initialized. Start with `luma.spector.displayUI()`")();
+    const { Spector } = globalThis.SPECTOR;
+    spector = new Spector();
     if (globalThis.luma) {
       globalThis.luma.spector = spector;
     }
@@ -2600,21 +2800,21 @@ function initializeSpectorJS(props) {
   if (!initialized) {
     initialized = true;
     spector.spyCanvases();
-    spector == null ? void 0 : spector.onCaptureStarted.add((capture) => import_core10.log.info("Spector capture started:", capture)());
+    spector == null ? void 0 : spector.onCaptureStarted.add((capture) => import_core11.log.info("Spector capture started:", capture)());
     spector == null ? void 0 : spector.onCapture.add((capture) => {
-      import_core10.log.info("Spector capture complete:", capture)();
+      import_core11.log.info("Spector capture complete:", capture)();
       spector == null ? void 0 : spector.getResultUI();
       spector == null ? void 0 : spector.resultView.display();
       spector == null ? void 0 : spector.resultView.addCapture(capture);
     });
   }
-  if (props == null ? void 0 : props.canvas) {
-    if (typeof props.spector === "string" && props.spector !== props.canvas.id) {
-      return spector;
-    }
-    spector == null ? void 0 : spector.startCapture(props == null ? void 0 : props.canvas, 500);
+  if (props.gl) {
+    const gl = props.gl;
+    const device = gl.device;
+    spector == null ? void 0 : spector.startCapture(props.gl, 500);
+    gl.device = device;
     new Promise((resolve) => setTimeout(resolve, 2e3)).then((_) => {
-      import_core10.log.info("Spector capture stopped after 2 seconds")();
+      import_core11.log.info("Spector capture stopped after 2 seconds")();
       spector == null ? void 0 : spector.stopCapture();
     });
   }
@@ -2622,8 +2822,8 @@ function initializeSpectorJS(props) {
 }
 
 // dist/context/debug/webgl-developer-tools.js
-var import_core11 = require("@luma.gl/core");
-var import_constants12 = require("@luma.gl/constants");
+var import_core12 = require("@luma.gl/core");
+var import_constants14 = require("@luma.gl/constants");
 var import_env = require("@probe.gl/env");
 var WEBGL_DEBUG_CDN_URL = "https://unpkg.com/webgl-debug@2.0.1/index.js";
 function getWebGLContextData(gl) {
@@ -2646,18 +2846,18 @@ function getRealContext(gl) {
 }
 function getDebugContext(gl, props) {
   if (!globalThis.WebGLDebugUtils) {
-    import_core11.log.warn("webgl-debug not loaded")();
+    import_core12.log.warn("webgl-debug not loaded")();
     return gl;
   }
   const data = getWebGLContextData(gl);
   if (data.debugContext) {
     return data.debugContext;
   }
-  globalThis.WebGLDebugUtils.init({ ...import_constants12.GL, ...gl });
+  globalThis.WebGLDebugUtils.init({ ...import_constants14.GL, ...gl });
   const glDebug = globalThis.WebGLDebugUtils.makeDebugContext(gl, onGLError.bind(null, props), onValidateGLFunc.bind(null, props));
-  for (const key in import_constants12.GL) {
-    if (!(key in glDebug) && typeof import_constants12.GL[key] === "number") {
-      glDebug[key] = import_constants12.GL[key];
+  for (const key in import_constants14.GL) {
+    if (!(key in glDebug) && typeof import_constants14.GL[key] === "number") {
+      glDebug[key] = import_constants14.GL[key];
     }
   }
   class WebGLDebugContext {
@@ -2681,7 +2881,7 @@ function onGLError(props, err, functionName, args) {
   const errorMessage = globalThis.WebGLDebugUtils.glEnumToString(err);
   const functionArgs = globalThis.WebGLDebugUtils.glFunctionArgsToString(functionName, args);
   const message2 = `${errorMessage} in gl.${functionName}(${functionArgs})`;
-  import_core11.log.error(message2)();
+  import_core12.log.error(message2)();
   debugger;
   if (props.throwOnError) {
     throw new Error(message2);
@@ -2689,9 +2889,9 @@ function onGLError(props, err, functionName, args) {
 }
 function onValidateGLFunc(props, functionName, functionArgs) {
   let functionString = "";
-  if (import_core11.log.level >= 1) {
+  if (import_core12.log.level >= 1) {
     functionString = getFunctionString(functionName, functionArgs);
-    import_core11.log.log(1, functionString)();
+    import_core12.log.log(1, functionString)();
   }
   if (props.break && props.break.length > 0) {
     functionString = functionString || getFunctionString(functionName, functionArgs);
@@ -2706,17 +2906,25 @@ function onValidateGLFunc(props, functionName, functionArgs) {
       if (props.throwOnError) {
         throw new Error(`Undefined argument: ${functionString}`);
       } else {
-        import_core11.log.error(`Undefined argument: ${functionString}`)();
+        import_core12.log.error(`Undefined argument: ${functionString}`)();
         debugger;
       }
     }
   }
 }
 
+// dist/utils/uid.js
+var uidCounters = {};
+function uid(id = "id") {
+  uidCounters[id] = uidCounters[id] || 1;
+  const count = uidCounters[id]++;
+  return `${id}-${count}`;
+}
+
 // dist/adapter/resources/webgl-buffer.js
-var import_core12 = require("@luma.gl/core");
-var import_constants13 = require("@luma.gl/constants");
-var WEBGLBuffer = class extends import_core12.Buffer {
+var import_core13 = require("@luma.gl/core");
+var import_constants15 = require("@luma.gl/constants");
+var WEBGLBuffer = class extends import_core13.Buffer {
   device;
   gl;
   handle;
@@ -2814,33 +3022,33 @@ var WEBGLBuffer = class extends import_core12.Buffer {
   }
 };
 function getWebGLTarget(usage) {
-  if (usage & import_core12.Buffer.INDEX) {
+  if (usage & import_core13.Buffer.INDEX) {
     return 34963;
   }
-  if (usage & import_core12.Buffer.VERTEX) {
+  if (usage & import_core13.Buffer.VERTEX) {
     return 34962;
   }
-  if (usage & import_core12.Buffer.UNIFORM) {
+  if (usage & import_core13.Buffer.UNIFORM) {
     return 35345;
   }
   return 34962;
 }
 function getWebGLUsage(usage) {
-  if (usage & import_core12.Buffer.INDEX) {
+  if (usage & import_core13.Buffer.INDEX) {
     return 35044;
   }
-  if (usage & import_core12.Buffer.VERTEX) {
+  if (usage & import_core13.Buffer.VERTEX) {
     return 35044;
   }
-  if (usage & import_core12.Buffer.UNIFORM) {
+  if (usage & import_core13.Buffer.UNIFORM) {
     return 35048;
   }
   return 35044;
 }
 
 // dist/adapter/resources/webgl-shader.js
-var import_core13 = require("@luma.gl/core");
-var import_constants14 = require("@luma.gl/constants");
+var import_core14 = require("@luma.gl/core");
+var import_constants16 = require("@luma.gl/constants");
 
 // dist/adapter/helpers/parse-shader-compiler-log.js
 function parseShaderCompilerLog(errLog) {
@@ -2887,7 +3095,7 @@ function getMessageType(messageType) {
 }
 
 // dist/adapter/resources/webgl-shader.js
-var WEBGLShader = class extends import_core13.Shader {
+var WEBGLShader = class extends import_core14.Shader {
   device;
   handle;
   constructor(device, props) {
@@ -2917,8 +3125,8 @@ var WEBGLShader = class extends import_core13.Shader {
     return this.getCompilationInfoSync();
   }
   getCompilationInfoSync() {
-    const log9 = this.device.gl.getShaderInfoLog(this.handle);
-    return log9 ? parseShaderCompilerLog(log9) : [];
+    const log12 = this.device.gl.getShaderInfoLog(this.handle);
+    return log12 ? parseShaderCompilerLog(log12) : [];
   }
   getTranslatedSource() {
     const extensions = this.device.getExtension("WEBGL_debug_shaders");
@@ -2928,13 +3136,13 @@ var WEBGLShader = class extends import_core13.Shader {
   // PRIVATE METHODS
   /** Compile a shader and get compilation status */
   async _compile(source) {
-    const addGLSLVersion = (source2) => source2.startsWith("#version ") ? source2 : `#version 100
+    const addGLSLVersion = (source2) => source2.startsWith("#version ") ? source2 : `#version 300 es
 ${source2}`;
     source = addGLSLVersion(source);
     const { gl } = this.device;
     gl.shaderSource(this.handle, source);
     gl.compileShader(this.handle);
-    if (import_core13.log.level === 0) {
+    if (import_core14.log.level === 0) {
       this.compilationStatus = "pending";
       return;
     }
@@ -2946,9 +3154,9 @@ ${source2}`;
       }
       return;
     }
-    import_core13.log.once(1, "Shader compilation is asynchronous")();
+    import_core14.log.once(1, "Shader compilation is asynchronous")();
     await this._waitForCompilationComplete();
-    import_core13.log.info(2, `Shader ${this.id} - async compilation complete: ${this.compilationStatus}`)();
+    import_core14.log.info(2, `Shader ${this.id} - async compilation complete: ${this.compilationStatus}`)();
     this._getCompilationStatus();
     this.debugShader();
   }
@@ -2980,26 +3188,37 @@ ${source2}`;
 };
 
 // dist/adapter/resources/webgl-render-pass.js
-var import_core14 = require("@luma.gl/core");
-var import_constants15 = require("@luma.gl/constants");
+var import_core15 = require("@luma.gl/core");
+var import_constants17 = require("@luma.gl/constants");
 var GL_DEPTH_BUFFER_BIT = 256;
 var GL_STENCIL_BUFFER_BIT = 1024;
 var GL_COLOR_BUFFER_BIT = 16384;
 var GL_COLOR = 6144;
 var COLOR_CHANNELS = [1, 2, 4, 8];
-var WEBGLRenderPass = class extends import_core14.RenderPass {
+var WEBGLRenderPass = class extends import_core15.RenderPass {
   device;
   /** Parameters that should be applied before each draw call */
   glParameters;
   constructor(device, props) {
+    var _a;
     super(device, props);
     this.device = device;
-    pushContextState(this.device.gl);
-    this.setParameters(this.props.parameters);
+    let viewport;
+    if (!((_a = props == null ? void 0 : props.parameters) == null ? void 0 : _a.viewport)) {
+      if (props == null ? void 0 : props.framebuffer) {
+        const { width, height } = props.framebuffer;
+        viewport = [0, 0, width, height];
+      } else {
+        const [width, height] = device.getCanvasContext().getDrawingBufferSize();
+        viewport = [0, 0, width, height];
+      }
+    }
+    this.device.pushState();
+    this.setParameters({ viewport, ...this.props.parameters });
     this.clear();
   }
   end() {
-    popContextState(this.device.gl);
+    this.device.popState();
   }
   pushDebugGroup(groupLabel) {
   }
@@ -3101,184 +3320,12 @@ var WEBGLRenderPass = class extends import_core14.RenderPass {
 };
 
 // dist/adapter/resources/webgl-render-pipeline.js
-var import_core15 = require("@luma.gl/core");
+var import_core16 = require("@luma.gl/core");
 var import_constants22 = require("@luma.gl/constants");
 
 // dist/adapter/helpers/get-shader-layout.js
 var import_constants19 = require("@luma.gl/constants");
 
-// dist/classic/accessor.js
-var import_constants17 = require("@luma.gl/constants");
-
-// dist/classic/typed-array-utils.js
-var import_constants16 = require("@luma.gl/constants");
-var ERR_TYPE_DEDUCTION = "Failed to deduce GL constant from typed array";
-function getGLTypeFromTypedArray(arrayOrType) {
-  const type = ArrayBuffer.isView(arrayOrType) ? arrayOrType.constructor : arrayOrType;
-  switch (type) {
-    case Float32Array:
-      return 5126;
-    case Uint16Array:
-      return 5123;
-    case Uint32Array:
-      return 5125;
-    case Uint8Array:
-      return 5121;
-    case Uint8ClampedArray:
-      return 5121;
-    case Int8Array:
-      return 5120;
-    case Int16Array:
-      return 5122;
-    case Int32Array:
-      return 5124;
-    default:
-      throw new Error(ERR_TYPE_DEDUCTION);
-  }
-}
-function getTypedArrayFromGLType(glType, options) {
-  const { clamped = true } = options || {};
-  switch (glType) {
-    case 5126:
-      return Float32Array;
-    case 5123:
-    case 33635:
-    case 32819:
-    case 32820:
-      return Uint16Array;
-    case 5125:
-      return Uint32Array;
-    case 5121:
-      return clamped ? Uint8ClampedArray : Uint8Array;
-    case 5120:
-      return Int8Array;
-    case 5122:
-      return Int16Array;
-    case 5124:
-      return Int32Array;
-    default:
-      throw new Error("Failed to deduce typed array type from GL constant");
-  }
-}
-
-// dist/classic/accessor.js
-var DEFAULT_ACCESSOR_VALUES = {
-  offset: 0,
-  stride: 0,
-  type: 5126,
-  size: 1,
-  divisor: 0,
-  normalized: false,
-  integer: false
-};
-var Accessor = class {
-  offset;
-  stride;
-  type;
-  size;
-  divisor;
-  normalized;
-  integer;
-  buffer;
-  index;
-  static getBytesPerElement(accessor) {
-    const ArrayType = getTypedArrayFromGLType(accessor.type || 5126);
-    return ArrayType.BYTES_PER_ELEMENT;
-  }
-  static getBytesPerVertex(accessor) {
-    const ArrayType = getTypedArrayFromGLType(accessor.type || 5126);
-    return ArrayType.BYTES_PER_ELEMENT * accessor.size;
-  }
-  // Combines (merges) a list of accessors. On top of default values
-  // Usually [programAccessor, bufferAccessor, appAccessor]
-  // All props will be set in the returned object.
-  // TODO check for conflicts between values in the supplied accessors
-  static resolve(...accessors) {
-    return new Accessor(...[DEFAULT_ACCESSOR_VALUES, ...accessors]);
-  }
-  constructor(...accessors) {
-    accessors.forEach((accessor) => this._assign(accessor));
-    Object.freeze(this);
-  }
-  toString() {
-    return JSON.stringify(this);
-  }
-  // ACCESSORS
-  // TODO - remove>
-  get BYTES_PER_ELEMENT() {
-    return Accessor.getBytesPerElement(this);
-  }
-  get BYTES_PER_VERTEX() {
-    return Accessor.getBytesPerVertex(this);
-  }
-  // PRIVATE
-  // eslint-disable-next-line complexity, max-statements
-  _assign(props = {}) {
-    if (props.type !== void 0) {
-      this.type = props.type;
-      if (props.type === 5124 || props.type === 5125) {
-        this.integer = true;
-      }
-    }
-    if (props.size !== void 0) {
-      this.size = props.size;
-    }
-    if (props.offset !== void 0) {
-      this.offset = props.offset;
-    }
-    if (props.stride !== void 0) {
-      this.stride = props.stride;
-    }
-    if (props.normalize !== void 0) {
-      this.normalized = props.normalize;
-    }
-    if (props.normalized !== void 0) {
-      this.normalized = props.normalized;
-    }
-    if (props.integer !== void 0) {
-      this.integer = props.integer;
-    }
-    if (props.divisor !== void 0) {
-      this.divisor = props.divisor;
-    }
-    if (props.buffer !== void 0) {
-      this.buffer = props.buffer;
-    }
-    if (props.index !== void 0) {
-      if (typeof props.index === "boolean") {
-        this.index = props.index ? 1 : 0;
-      } else {
-        this.index = props.index;
-      }
-    }
-    if (props.instanced !== void 0) {
-      this.divisor = props.instanced ? 1 : 0;
-    }
-    if (props.isInstanced !== void 0) {
-      this.divisor = props.isInstanced ? 1 : 0;
-    }
-    if (this.offset === void 0)
-      delete this.offset;
-    if (this.stride === void 0)
-      delete this.stride;
-    if (this.type === void 0)
-      delete this.type;
-    if (this.size === void 0)
-      delete this.size;
-    if (this.divisor === void 0)
-      delete this.divisor;
-    if (this.normalized === void 0)
-      delete this.normalized;
-    if (this.integer === void 0)
-      delete this.integer;
-    if (this.buffer === void 0)
-      delete this.buffer;
-    if (this.index === void 0)
-      delete this.index;
-    return this;
-  }
-};
-
 // dist/adapter/helpers/decode-webgl-types.js
 var import_constants18 = require("@luma.gl/constants");
 function isSamplerUniform(type) {
@@ -3445,8 +3492,7 @@ function readVaryings(gl, program) {
     }
     const { name, type: compositeType, size } = activeInfo;
     const { glType, components } = decodeGLUniformType(compositeType);
-    const accessor = new Accessor({ type: glType, size: size * components });
-    const varying = { location, name, accessor };
+    const varying = { location, name, type: glType, size: size * components };
     varyings.push(varying);
   }
   varyings.sort((a, b) => a.location - b.location);
@@ -3713,7 +3759,7 @@ function getGLPrimitive(topology) {
 
 // dist/adapter/resources/webgl-render-pipeline.js
 var LOG_PROGRAM_PERF_PRIORITY = 4;
-var WEBGLRenderPipeline = class extends import_core15.RenderPipeline {
+var WEBGLRenderPipeline = class extends import_core16.RenderPipeline {
   /** The WebGL device that created this render pipeline */
   device;
   /** Handle to underlying WebGL program */
@@ -3746,9 +3792,9 @@ var WEBGLRenderPipeline = class extends import_core15.RenderPipeline {
       this.device.gl.transformFeedbackVaryings(this.handle, varyings, bufferMode);
     }
     this._linkShaders();
-    import_core15.log.time(1, `RenderPipeline ${this.id} - shaderLayout introspection`)();
+    import_core16.log.time(1, `RenderPipeline ${this.id} - shaderLayout introspection`)();
     this.introspectedLayout = getShaderLayout(this.device.gl, this.handle);
-    import_core15.log.timeEnd(1, `RenderPipeline ${this.id} - shaderLayout introspection`)();
+    import_core16.log.timeEnd(1, `RenderPipeline ${this.id} - shaderLayout introspection`)();
     this.shaderLayout = mergeShaderLayout(this.introspectedLayout, props.shaderLayout);
   }
   destroy() {
@@ -3767,12 +3813,12 @@ var WEBGLRenderPipeline = class extends import_core15.RenderPipeline {
       if (!binding) {
         const validBindings = this.shaderLayout.bindings.map((binding2) => `"${binding2.name}"`).join(", ");
         if (!(options == null ? void 0 : options.disableWarnings)) {
-          import_core15.log.warn(`Unknown binding "${name}" in render pipeline "${this.id}", expected one of ${validBindings}`)();
+          import_core16.log.warn(`No binding "${name}" in render pipeline "${this.id}", expected one of ${validBindings}`, value)();
         }
         continue;
       }
       if (!value) {
-        import_core15.log.warn(`Unsetting binding "${name}" in render pipeline "${this.id}"`)();
+        import_core16.log.warn(`Unsetting binding "${name}" in render pipeline "${this.id}"`)();
       }
       switch (binding.type) {
         case "uniform":
@@ -3786,7 +3832,7 @@ var WEBGLRenderPipeline = class extends import_core15.RenderPipeline {
           }
           break;
         case "sampler":
-          import_core15.log.warn(`Ignoring sampler ${name}`)();
+          import_core16.log.warn(`Ignoring sampler ${name}`)();
           break;
         default:
           throw new Error(binding.type);
@@ -3819,11 +3865,11 @@ var WEBGLRenderPipeline = class extends import_core15.RenderPipeline {
     const isIndexed = Boolean(vertexArray.indexBuffer);
     const glIndexType = (_a = vertexArray.indexBuffer) == null ? void 0 : _a.glIndexType;
     if (this.linkStatus !== "success") {
-      import_core15.log.info(2, `RenderPipeline:${this.id}.draw() aborted - waiting for shader linking`)();
+      import_core16.log.info(2, `RenderPipeline:${this.id}.draw() aborted - waiting for shader linking`)();
       return false;
     }
     if (!this._areTexturesRenderable()) {
-      import_core15.log.info(2, `RenderPipeline:${this.id}.draw() aborted - textures not yet loaded`)();
+      import_core16.log.info(2, `RenderPipeline:${this.id}.draw() aborted - textures not yet loaded`)();
       return false;
     }
     this.device.gl.useProgram(this.handle);
@@ -3862,7 +3908,7 @@ var WEBGLRenderPipeline = class extends import_core15.RenderPipeline {
   setUniformsWebGL(uniforms) {
     const { bindings } = splitUniformsAndBindings(uniforms);
     Object.keys(bindings).forEach((name) => {
-      import_core15.log.warn(`Unsupported value "${JSON.stringify(bindings[name])}" used in setUniforms() for key ${name}. Use setBindings() instead?`)();
+      import_core16.log.warn(`Unsupported value "${JSON.stringify(bindings[name])}" used in setUniforms() for key ${name}. Use setBindings() instead?`)();
     });
     Object.assign(this.uniforms, uniforms);
   }
@@ -3873,19 +3919,19 @@ var WEBGLRenderPipeline = class extends import_core15.RenderPipeline {
     const { gl } = this.device;
     gl.attachShader(this.handle, this.vs.handle);
     gl.attachShader(this.handle, this.fs.handle);
-    import_core15.log.time(LOG_PROGRAM_PERF_PRIORITY, `linkProgram for ${this.id}`)();
+    import_core16.log.time(LOG_PROGRAM_PERF_PRIORITY, `linkProgram for ${this.id}`)();
     gl.linkProgram(this.handle);
-    import_core15.log.timeEnd(LOG_PROGRAM_PERF_PRIORITY, `linkProgram for ${this.id}`)();
-    if (import_core15.log.level === 0) {
+    import_core16.log.timeEnd(LOG_PROGRAM_PERF_PRIORITY, `linkProgram for ${this.id}`)();
+    if (import_core16.log.level === 0) {
     }
     if (!this.device.features.has("compilation-status-async-webgl")) {
       const status2 = this._getLinkStatus();
       this._reportLinkStatus(status2);
       return;
     }
-    import_core15.log.once(1, "RenderPipeline linking is asynchronous")();
+    import_core16.log.once(1, "RenderPipeline linking is asynchronous")();
     await this._waitForLinkComplete();
-    import_core15.log.info(2, `RenderPipeline ${this.id} - async linking complete: ${this.linkStatus}`)();
+    import_core16.log.info(2, `RenderPipeline ${this.id} - async linking complete: ${this.linkStatus}`)();
     const status = this._getLinkStatus();
     this._reportLinkStatus(status);
   }
@@ -3954,7 +4000,7 @@ var WEBGLRenderPipeline = class extends import_core15.RenderPipeline {
     let texturesRenderable = true;
     for (const bindingInfo of this.shaderLayout.bindings) {
       if (!this.bindings[bindingInfo.name] && !this.bindings[bindingInfo.name.replace(/Uniforms$/, "")]) {
-        import_core15.log.warn(`Binding ${bindingInfo.name} not found in ${this.id}`)();
+        import_core16.log.warn(`Binding ${bindingInfo.name} not found in ${this.id}`)();
         texturesRenderable = false;
       }
     }
@@ -4013,7 +4059,7 @@ var WEBGLRenderPipeline = class extends import_core15.RenderPipeline {
           } else if (value instanceof WEBGLTexture) {
             texture = value;
           } else if (value instanceof WEBGLFramebuffer && value.colorAttachments[0] instanceof WEBGLTextureView) {
-            import_core15.log.warn("Passing framebuffer in texture binding may be deprecated. Use fbo.colorAttachments[0] instead")();
+            import_core16.log.warn("Passing framebuffer in texture binding may be deprecated. Use fbo.colorAttachments[0] instead")();
             texture = value.colorAttachments[0].texture;
           } else {
             throw new Error("No texture");
@@ -4052,7 +4098,7 @@ function mergeShaderLayout(baseLayout, overrideLayout) {
   for (const attribute of (overrideLayout == null ? void 0 : overrideLayout.attributes) || []) {
     const baseAttribute = mergedLayout.attributes.find((attr) => attr.name === attribute.name);
     if (!baseAttribute) {
-      import_core15.log.warn(`shader layout attribute ${attribute.name} not present in shader`);
+      import_core16.log.warn(`shader layout attribute ${attribute.name} not present in shader`);
     } else {
       baseAttribute.type = attribute.type || baseAttribute.type;
       baseAttribute.stepMode = attribute.stepMode || baseAttribute.stepMode;
@@ -4062,12 +4108,12 @@ function mergeShaderLayout(baseLayout, overrideLayout) {
 }
 
 // dist/adapter/resources/webgl-command-encoder.js
-var import_core17 = require("@luma.gl/core");
+var import_core18 = require("@luma.gl/core");
 
 // dist/adapter/resources/webgl-command-buffer.js
-var import_core16 = require("@luma.gl/core");
+var import_core17 = require("@luma.gl/core");
 var import_constants23 = require("@luma.gl/constants");
-var WEBGLCommandBuffer = class extends import_core16.CommandBuffer {
+var WEBGLCommandBuffer = class extends import_core17.CommandBuffer {
   device;
   commands = [];
   constructor(device) {
@@ -4142,7 +4188,7 @@ function _copyTextureToBuffer(device, options) {
   if (mipLevel !== 0 || depthOrArrayLayers !== 0 || bytesPerRow || rowsPerImage) {
     throw new Error("not implemented");
   }
-  const { framebuffer, destroyFramebuffer } = getFramebuffer(source);
+  const { framebuffer, destroyFramebuffer } = getFramebuffer2(source);
   let prevHandle;
   try {
     const webglBuffer = destination;
@@ -4190,7 +4236,7 @@ function _copyTextureToTexture(device, options) {
     height = options.destination.height
     // depthOrArrayLayers = 0
   } = options;
-  const { framebuffer, destroyFramebuffer } = getFramebuffer(source);
+  const { framebuffer, destroyFramebuffer } = getFramebuffer2(source);
   const [sourceX, sourceY] = origin;
   const [destinationX, destinationY, destinationZ] = destinationOrigin;
   const prevHandle = device.gl.bindFramebuffer(36160, framebuffer.handle);
@@ -4224,8 +4270,8 @@ function _copyTextureToTexture(device, options) {
     framebuffer.destroy();
   }
 }
-function getFramebuffer(source) {
-  if (source instanceof import_core16.Texture) {
+function getFramebuffer2(source) {
+  if (source instanceof import_core17.Texture) {
     const { width, height, id } = source;
     const framebuffer = source.device.createFramebuffer({
       id: `framebuffer-for-${id}`,
@@ -4239,7 +4285,7 @@ function getFramebuffer(source) {
 }
 
 // dist/adapter/resources/webgl-command-encoder.js
-var WEBGLCommandEncoder = class extends import_core17.CommandEncoder {
+var WEBGLCommandEncoder = class extends import_core18.CommandEncoder {
   device;
   commandBuffer;
   constructor(device, props) {
@@ -4278,7 +4324,7 @@ var WEBGLCommandEncoder = class extends import_core17.CommandEncoder {
 };
 
 // dist/adapter/resources/webgl-vertex-array.js
-var import_core18 = require("@luma.gl/core");
+var import_core19 = require("@luma.gl/core");
 var import_constants24 = require("@luma.gl/constants");
 var import_env2 = require("@probe.gl/env");
 
@@ -4304,7 +4350,7 @@ function fillArray(options) {
 }
 
 // dist/adapter/resources/webgl-vertex-array.js
-var WEBGLVertexArray = class extends import_core18.VertexArray {
+var WEBGLVertexArray = class extends import_core19.VertexArray {
   get [Symbol.toStringTag]() {
     return "VertexArray";
   }
@@ -4364,6 +4410,7 @@ var WEBGLVertexArray = class extends import_core18.VertexArray {
     } else {
       this.device.gl.vertexAttribPointer(location, size, type, normalized, stride, offset);
     }
+    this.device.gl.bindBuffer(34962, null);
     this.device.gl.enableVertexAttribArray(location);
     this.device.gl.vertexAttribDivisor(location, divisor || 0);
     this.attributes[location] = buffer;
@@ -4470,7 +4517,7 @@ var WEBGLVertexArray = class extends import_core18.VertexArray {
     this.buffer = this.buffer || this.device.createBuffer({ byteLength });
     updateNeeded = updateNeeded || !compareConstantArrayValues(constantValue, this.bufferValue);
     if (updateNeeded) {
-      const typedArray = (0, import_core18.getScratchArray)(value.constructor, length);
+      const typedArray = (0, import_core19.getScratchArray)(value.constructor, length);
       fillArray({ target: typedArray, source: constantValue, start: 0, count: length });
       this.buffer.write(typedArray);
       this.bufferValue = value;
@@ -4497,9 +4544,9 @@ function compareConstantArrayValues(v1, v2) {
 }
 
 // dist/adapter/resources/webgl-transform-feedback.js
-var import_core19 = require("@luma.gl/core");
+var import_core20 = require("@luma.gl/core");
 var import_constants25 = require("@luma.gl/constants");
-var WEBGLTransformFeedback = class extends import_core19.TransformFeedback {
+var WEBGLTransformFeedback = class extends import_core20.TransformFeedback {
   device;
   gl;
   handle;
@@ -4542,7 +4589,7 @@ var WEBGLTransformFeedback = class extends import_core19.TransformFeedback {
   }
   end() {
     this.gl.endTransformFeedback();
-    if (!this.bindOnUse) {
+    if (this.bindOnUse) {
       this._unbindBuffers();
     }
     this.gl.bindTransformFeedback(36386, null);
@@ -4562,7 +4609,7 @@ var WEBGLTransformFeedback = class extends import_core19.TransformFeedback {
     const { buffer, byteLength, byteOffset } = this._getBufferRange(bufferOrRange);
     if (location < 0) {
       this.unusedBuffers[locationOrName] = buffer;
-      import_core19.log.warn(`${this.id} unusedBuffers varying buffer ${locationOrName}`)();
+      import_core20.log.warn(`${this.id} unusedBuffers varying buffer ${locationOrName}`)();
       return;
     }
     this.buffers[location] = { buffer, byteLength, byteOffset };
@@ -4649,9 +4696,9 @@ function isIndex(value) {
 }
 
 // dist/adapter/resources/webgl-query-set.js
-var import_core20 = require("@luma.gl/core");
+var import_core21 = require("@luma.gl/core");
 var import_constants26 = require("@luma.gl/constants");
-var WEBGLQuerySet = class extends import_core20.QuerySet {
+var WEBGLQuerySet = class extends import_core21.QuerySet {
   device;
   handle;
   target = null;
@@ -4778,152 +4825,24 @@ var WEBGLQuerySet = class extends import_core20.QuerySet {
   }
 };
 
-// dist/classic/copy-and-blit.js
-var import_core21 = require("@luma.gl/core");
-var import_constants28 = require("@luma.gl/constants");
-
-// dist/classic/format-utils.js
-var import_constants27 = require("@luma.gl/constants");
-function glFormatToComponents(format) {
-  switch (format) {
-    case 6406:
-    case 33326:
-    case 6403:
-      return 1;
-    case 33328:
-    case 33319:
-      return 2;
-    case 6407:
-    case 34837:
-      return 3;
-    case 6408:
-    case 34836:
-      return 4;
-    default:
-      return 0;
+// dist/deprecated/clear.js
+var import_core22 = require("@luma.gl/core");
+var GL_DEPTH_BUFFER_BIT2 = 256;
+var GL_STENCIL_BUFFER_BIT2 = 1024;
+var GL_COLOR_BUFFER_BIT2 = 16384;
+function clear(device, options) {
+  import_core22.log.warn("clear will be removed in next minor release");
+  const { framebuffer = null, color = null, depth = null, stencil = null } = options || {};
+  const parameters = {};
+  if (framebuffer) {
+    parameters.framebuffer = framebuffer;
   }
-}
-function glTypeToBytes(type) {
-  switch (type) {
-    case 5121:
-      return 1;
-    case 33635:
-    case 32819:
-    case 32820:
-      return 2;
-    case 5126:
-      return 4;
-    default:
-      return 0;
-  }
-}
-
-// dist/classic/copy-and-blit.js
-function readPixelsToArray(source, options) {
-  var _a, _b;
-  const {
-    sourceX = 0,
-    sourceY = 0,
-    sourceFormat = 6408,
-    sourceAttachment = 36064
-    // TODO - support gl.readBuffer
-  } = options || {};
-  let {
-    target = null,
-    // following parameters are auto deduced if not provided
-    sourceWidth,
-    sourceHeight,
-    sourceType
-  } = options || {};
-  const { framebuffer, deleteFramebuffer } = getFramebuffer2(source);
-  const { gl, handle } = framebuffer;
-  sourceWidth = sourceWidth || framebuffer.width;
-  sourceHeight = sourceHeight || framebuffer.height;
-  const attachment = sourceAttachment - 36064;
-  sourceType = sourceType || ((_b = (_a = framebuffer.colorAttachments[attachment]) == null ? void 0 : _a.texture) == null ? void 0 : _b.glType) || 5121;
-  target = getPixelArray(target, sourceType, sourceFormat, sourceWidth, sourceHeight);
-  sourceType = sourceType || getGLTypeFromTypedArray(target);
-  const prevHandle = gl.bindFramebuffer(36160, handle);
-  gl.readPixels(sourceX, sourceY, sourceWidth, sourceHeight, sourceFormat, sourceType, target);
-  gl.bindFramebuffer(36160, prevHandle || null);
-  if (deleteFramebuffer) {
-    framebuffer.destroy();
-  }
-  return target;
-}
-function readPixelsToBuffer(source, options) {
-  const { target, sourceX = 0, sourceY = 0, sourceFormat = 6408, targetByteOffset = 0 } = options || {};
-  let { sourceWidth, sourceHeight, sourceType } = options || {};
-  const { framebuffer, deleteFramebuffer } = getFramebuffer2(source);
-  sourceWidth = sourceWidth || framebuffer.width;
-  sourceHeight = sourceHeight || framebuffer.height;
-  const webglFramebuffer = framebuffer;
-  sourceType = sourceType || 5121;
-  let webglBufferTarget = target;
-  if (!webglBufferTarget) {
-    const components = glFormatToComponents(sourceFormat);
-    const byteCount = glTypeToBytes(sourceType);
-    const byteLength = targetByteOffset + sourceWidth * sourceHeight * components * byteCount;
-    webglBufferTarget = webglFramebuffer.device.createBuffer({ byteLength });
-  }
-  const commandEncoder = source.device.createCommandEncoder();
-  commandEncoder.copyTextureToBuffer({
-    source,
-    width: sourceWidth,
-    height: sourceHeight,
-    origin: [sourceX, sourceY],
-    destination: webglBufferTarget,
-    byteOffset: targetByteOffset
-  });
-  commandEncoder.destroy();
-  if (deleteFramebuffer) {
-    framebuffer.destroy();
-  }
-  return webglBufferTarget;
-}
-function getFramebuffer2(source) {
-  if (!(source instanceof import_core21.Framebuffer)) {
-    return { framebuffer: toFramebuffer(source), deleteFramebuffer: true };
-  }
-  return { framebuffer: source, deleteFramebuffer: false };
-}
-function toFramebuffer(texture, props) {
-  const { device, width, height, id } = texture;
-  const framebuffer = device.createFramebuffer({
-    ...props,
-    id: `framebuffer-for-${id}`,
-    width,
-    height,
-    colorAttachments: [texture]
-  });
-  return framebuffer;
-}
-function getPixelArray(pixelArray, type, format, width, height) {
-  if (pixelArray) {
-    return pixelArray;
-  }
-  type = type || 5121;
-  const ArrayType = getTypedArrayFromGLType(type, { clamped: false });
-  const components = glFormatToComponents(format);
-  return new ArrayType(width * height * components);
-}
-
-// dist/classic/clear.js
-var GL_DEPTH_BUFFER_BIT2 = 256;
-var GL_STENCIL_BUFFER_BIT2 = 1024;
-var GL_COLOR_BUFFER_BIT2 = 16384;
-function clear(device, options) {
-  const { framebuffer = null, color = null, depth = null, stencil = null } = options || {};
-  const parameters = {};
-  if (framebuffer) {
-    parameters.framebuffer = framebuffer;
-  }
-  let clearFlags = 0;
-  if (color) {
-    clearFlags |= GL_COLOR_BUFFER_BIT2;
-    if (color !== true) {
-      parameters.clearColor = color;
-    }
+  let clearFlags = 0;
+  if (color) {
+    clearFlags |= GL_COLOR_BUFFER_BIT2;
+    if (color !== true) {
+      parameters.clearColor = color;
+    }
   }
   if (depth) {
     clearFlags |= GL_DEPTH_BUFFER_BIT2;
@@ -4944,8 +4863,10 @@ function clear(device, options) {
 }
 
 // dist/adapter/webgl-device.js
-var LOG_LEVEL2 = 1;
-var _WebGLDevice = class extends import_core22.Device {
+var WebGLDevice = class extends import_core23.Device {
+  //
+  // Public `Device` API
+  //
   /** type of this device */
   type = "webgl";
   /** The underlying WebGL context */
@@ -4956,68 +4877,22 @@ var _WebGLDevice = class extends import_core22.Device {
   canvasContext;
   lost;
   _resolveContextLost;
-  //
-  // Static methods, expected to be present by `luma.createDevice()`
-  //
-  /** Check if WebGL 2 is available */
-  static isSupported() {
-    return typeof WebGL2RenderingContext !== "undefined";
-  }
-  /**
-   * Get a device instance from a GL context
-   * Creates and instruments the device if not already created
-   * @param gl
-   * @returns
-   */
-  static attach(gl) {
-    if (gl instanceof _WebGLDevice) {
-      return gl;
-    }
-    if ((gl == null ? void 0 : gl.device) instanceof import_core22.Device) {
-      return gl.device;
-    }
-    if (!isWebGL(gl)) {
-      throw new Error("Invalid WebGL2RenderingContext");
-    }
-    return new _WebGLDevice({ gl });
-  }
-  static async create(props = {}) {
-    var _a;
-    import_core22.log.groupCollapsed(LOG_LEVEL2, "WebGLDevice created")();
-    const promises = [];
-    if (props.debug) {
-      promises.push(loadWebGLDeveloperTools());
-    }
-    if (props.spector) {
-      promises.push(loadSpectorJS());
-    }
-    if (typeof props.canvas === "string") {
-      promises.push(import_core22.CanvasContext.pageLoaded);
-    }
-    const results = await Promise.allSettled(promises);
-    for (const result of results) {
-      if (result.status === "rejected") {
-        import_core22.log.error(`Failed to initialize debug libraries ${result.reason}`)();
-      }
-    }
-    import_core22.log.probe(LOG_LEVEL2 + 1, "DOM is loaded")();
-    if ((_a = props.gl) == null ? void 0 : _a.device) {
-      import_core22.log.warn("reattaching existing device")();
-      return _WebGLDevice.attach(props.gl);
-    }
-    const device = new _WebGLDevice(props);
-    const message2 = `Created ${device.type}${device.debug ? " debug" : ""} context: ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContext.id}`;
-    import_core22.log.probe(LOG_LEVEL2, message2)();
-    import_core22.log.table(LOG_LEVEL2, device.info)();
-    import_core22.log.groupEnd(LOG_LEVEL2)();
-    return device;
-  }
+  /** WebGL2 context. */
+  gl;
+  debug = false;
+  /** State used by luma.gl classes: TODO - move to canvasContext*/
+  _canvasSizeInfo = { clientWidth: 0, clientHeight: 0, devicePixelRatio: 1 };
+  /** State used by luma.gl classes - TODO - not used? */
+  _extensions = {};
+  _polyfilled = false;
+  /** Instance of Spector.js (if initialized) */
+  spectorJS;
   //
   // Public API
   //
   constructor(props) {
     var _a, _b;
-    super({ ...props, id: props.id || "webgl-device" });
+    super({ ...props, id: props.id || uid("webgl-device") });
     const device = (_a = props.gl) == null ? void 0 : _a.device;
     if (device) {
       throw new Error(`WebGL context already attached to device ${device.id}`);
@@ -5027,8 +4902,7 @@ var _WebGLDevice = class extends import_core22.Device {
     this.lost = new Promise((resolve) => {
       this._resolveContextLost = resolve;
     });
-    let gl = props.gl || null;
-    gl ||= createBrowserContext(this.canvasContext.canvas, {
+    this.handle = createBrowserContext(this.canvasContext.canvas, {
       ...props,
       onContextLost: (event) => {
         var _a2;
@@ -5038,11 +4912,11 @@ var _WebGLDevice = class extends import_core22.Device {
         });
       }
     });
-    if (!gl) {
+    this.gl = this.handle;
+    if (!this.handle) {
       throw new Error("WebGL context creation failed");
     }
-    this.handle = gl;
-    this.gl = gl;
+    this.spectorJS = initializeSpectorJS({ ...this.props, gl: this.handle });
     this.gl.device = this;
     this.gl._version = 2;
     this.info = getDeviceInfo(this.gl, this._extensions);
@@ -5052,20 +4926,15 @@ var _WebGLDevice = class extends import_core22.Device {
       this.features.initializeFeatures();
     }
     this.canvasContext.resize();
-    const { enable: enable2 = true, copyState = false } = props;
-    trackContextState(this.gl, {
-      enable: enable2,
-      copyState,
-      log: (...args) => import_core22.log.log(1, ...args)()
+    const glState = new WebGLStateTracker(this.gl, {
+      log: (...args) => import_core23.log.log(1, ...args)()
     });
+    glState.trackState(this.gl, { copyState: false });
     if (props.debug) {
       this.gl = makeDebugContext(this.gl, { ...props, throwOnError: true });
       this.debug = true;
-      import_core22.log.level = Math.max(import_core22.log.level, 1);
-      import_core22.log.warn("WebGL debug mode activated. Performance reduced.")();
-    }
-    if (props.spector) {
-      this.spectorJS = initializeSpectorJS({ ...this.props, canvas: this.handle.canvas });
+      import_core23.log.level = Math.max(import_core23.log.level, 1);
+      import_core23.log.warn("WebGL debug mode activated. Performance reduced.")();
     }
   }
   /**
@@ -5077,9 +4946,6 @@ var _WebGLDevice = class extends import_core22.Device {
   get isLost() {
     return this.gl.isContextLost();
   }
-  getSize() {
-    return [this.gl.drawingBufferWidth, this.gl.drawingBufferHeight];
-  }
   isTextureFormatSupported(format) {
     return isTextureFormatSupported(this.gl, format, this._extensions);
   }
@@ -5172,22 +5038,12 @@ var _WebGLDevice = class extends import_core22.Device {
     clear(this, options);
   }
   resetWebGL() {
-    import_core22.log.warn("WebGLDevice.resetWebGL is deprecated, use only for debugging")();
+    import_core23.log.warn("WebGLDevice.resetWebGL is deprecated, use only for debugging")();
     resetGLParameters(this.gl);
   }
   //
   // WebGL-only API (not part of `Device` API)
   //
-  /** WebGL2 context. */
-  gl;
-  debug = false;
-  /** State used by luma.gl classes: TODO - move to canvasContext*/
-  _canvasSizeInfo = { clientWidth: 0, clientHeight: 0, devicePixelRatio: 1 };
-  /** State used by luma.gl classes - TODO - not used? */
-  _extensions = {};
-  _polyfilled = false;
-  /** Instance of Spector.js (if initialized) */
-  spectorJS;
   /**
    * Triggers device (or WebGL context) loss.
    * @note primarily intended for testing how application reacts to device loss
@@ -5209,11 +5065,13 @@ var _WebGLDevice = class extends import_core22.Device {
   }
   /** Save current WebGL context state onto an internal stack */
   pushState() {
-    pushContextState(this.gl);
+    const webglState = WebGLStateTracker.get(this.gl);
+    webglState.push();
   }
   /** Restores previously saved context state */
   popState() {
-    popContextState(this.gl);
+    const webglState = WebGLStateTracker.get(this.gl);
+    webglState.pop();
   }
   /**
    * Storing data on a special field on WebGLObjects makes that data visible in SPECTOR chrome debug extension
@@ -5250,7 +5108,7 @@ var _WebGLDevice = class extends import_core22.Device {
     this._constants = this._constants || new Array(maxVertexAttributes).fill(null);
     const currentConstant = this._constants[location];
     if (currentConstant && compareConstantArrayValues2(currentConstant, constant)) {
-      import_core22.log.info(1, `setConstantAttributeWebGL(${location}) could have been skipped, value unchanged`)();
+      import_core23.log.info(1, `setConstantAttributeWebGL(${location}) could have been skipped, value unchanged`)();
     }
     this._constants[location] = constant;
     switch (constant.constructor) {
@@ -5273,18 +5131,6 @@ var _WebGLDevice = class extends import_core22.Device {
     return this._extensions;
   }
 };
-var WebGLDevice = _WebGLDevice;
-//
-// Public `Device` API
-//
-/** type of this device */
-__publicField(WebGLDevice, "type", "webgl");
-function isWebGL(gl) {
-  if (typeof WebGL2RenderingContext !== "undefined" && gl instanceof WebGL2RenderingContext) {
-    return true;
-  }
-  return Boolean(gl && Number.isFinite(gl._version));
-}
 function setConstantFloatArray(device, location, array) {
   switch (array.length) {
     case 1:
@@ -5319,4 +5165,325 @@ function compareConstantArrayValues2(v1, v2) {
   }
   return true;
 }
+
+// dist/context/polyfills/polyfill-webgl1-extensions.js
+var import_constants27 = require("@luma.gl/constants");
+var WEBGL1_STATIC_EXTENSIONS = {
+  WEBGL_depth_texture: {
+    UNSIGNED_INT_24_8_WEBGL: 34042
+  },
+  OES_element_index_uint: {},
+  OES_texture_float: {},
+  OES_texture_half_float: {
+    // @ts-expect-error different numbers?
+    HALF_FLOAT_OES: 5131
+  },
+  EXT_color_buffer_float: {},
+  OES_standard_derivatives: {
+    FRAGMENT_SHADER_DERIVATIVE_HINT_OES: 35723
+  },
+  EXT_frag_depth: {},
+  EXT_blend_minmax: {
+    MIN_EXT: 32775,
+    MAX_EXT: 32776
+  },
+  EXT_shader_texture_lod: {}
+};
+var getWEBGL_draw_buffers = (gl) => ({
+  drawBuffersWEBGL(buffers) {
+    return gl.drawBuffers(buffers);
+  },
+  COLOR_ATTACHMENT0_WEBGL: 36064,
+  COLOR_ATTACHMENT1_WEBGL: 36065,
+  COLOR_ATTACHMENT2_WEBGL: 36066,
+  COLOR_ATTACHMENT3_WEBGL: 36067
+});
+var getOES_vertex_array_object = (gl) => ({
+  VERTEX_ARRAY_BINDING_OES: 34229,
+  createVertexArrayOES() {
+    return gl.createVertexArray();
+  },
+  deleteVertexArrayOES(vertexArray) {
+    return gl.deleteVertexArray(vertexArray);
+  },
+  isVertexArrayOES(vertexArray) {
+    return gl.isVertexArray(vertexArray);
+  },
+  bindVertexArrayOES(vertexArray) {
+    return gl.bindVertexArray(vertexArray);
+  }
+});
+var getANGLE_instanced_arrays = (gl) => ({
+  VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: 35070,
+  drawArraysInstancedANGLE(...args) {
+    return gl.drawArraysInstanced(...args);
+  },
+  drawElementsInstancedANGLE(...args) {
+    return gl.drawElementsInstanced(...args);
+  },
+  vertexAttribDivisorANGLE(...args) {
+    return gl.vertexAttribDivisor(...args);
+  }
+});
+function enforceWebGL2(enforce = true) {
+  const prototype = HTMLCanvasElement.prototype;
+  if (!enforce && prototype.originalGetContext) {
+    prototype.getContext = prototype.originalGetContext;
+    prototype.originalGetContext = void 0;
+    return;
+  }
+  prototype.originalGetContext = prototype.getContext;
+  prototype.getContext = function(contextId, options) {
+    if (contextId === "webgl" || contextId === "experimental-webgl") {
+      const context = this.originalGetContext("webgl2", options);
+      if (context instanceof HTMLElement) {
+        polyfillWebGL1Extensions(context);
+      }
+      return context;
+    }
+    return this.originalGetContext(contextId, options);
+  };
+}
+function polyfillWebGL1Extensions(gl) {
+  gl.getExtension("EXT_color_buffer_float");
+  const boundExtensions = {
+    ...WEBGL1_STATIC_EXTENSIONS,
+    WEBGL_disjoint_timer_query: gl.getExtension("EXT_disjoint_timer_query_webgl2"),
+    WEBGL_draw_buffers: getWEBGL_draw_buffers(gl),
+    OES_vertex_array_object: getOES_vertex_array_object(gl),
+    ANGLE_instanced_arrays: getANGLE_instanced_arrays(gl)
+  };
+  const originalGetExtension = gl.getExtension;
+  gl.getExtension = function(extensionName) {
+    const ext = originalGetExtension.call(gl, extensionName);
+    if (ext) {
+      return ext;
+    }
+    if (extensionName in boundExtensions) {
+      return boundExtensions[extensionName];
+    }
+    return null;
+  };
+  const originalGetSupportedExtensions = gl.getSupportedExtensions;
+  gl.getSupportedExtensions = function() {
+    const extensions = originalGetSupportedExtensions.apply(gl) || [];
+    return extensions == null ? void 0 : extensions.concat(Object.keys(boundExtensions));
+  };
+}
+
+// dist/adapter/webgl-adapter.js
+var LOG_LEVEL2 = 1;
+var WebGLAdapter = class extends import_core24.Adapter {
+  /** type of device's created by this adapter */
+  type = "webgl";
+  constructor() {
+    super();
+    import_core24.Device.defaultProps = { ...import_core24.Device.defaultProps, ...DEFAULT_SPECTOR_PROPS };
+    WebGLDevice.adapter = this;
+  }
+  /** Check if WebGL 2 is available */
+  isSupported() {
+    return typeof WebGL2RenderingContext !== "undefined";
+  }
+  /** Force any created WebGL contexts to be WebGL2 contexts, polyfilled with WebGL1 extensions */
+  enforceWebGL2(enable2) {
+    enforceWebGL2(enable2);
+  }
+  /**
+   * Get a device instance from a GL context
+   * Creates and instruments the device if not already created
+   * @param gl
+   * @returns
+   */
+  async attach(gl) {
+    if (gl instanceof WebGLDevice) {
+      return gl;
+    }
+    if ((gl == null ? void 0 : gl.device) instanceof import_core24.Device) {
+      return gl.device;
+    }
+    if (!isWebGL(gl)) {
+      throw new Error("Invalid WebGL2RenderingContext");
+    }
+    return new WebGLDevice({ gl });
+  }
+  async create(props = {}) {
+    import_core24.log.groupCollapsed(LOG_LEVEL2, "WebGLDevice created")();
+    const promises = [];
+    if (props.debug) {
+      promises.push(loadWebGLDeveloperTools());
+    }
+    if (props.debugWithSpectorJS) {
+      promises.push(loadSpectorJS(props));
+    }
+    if (typeof props.canvas === "string") {
+      promises.push(import_core24.CanvasContext.pageLoaded);
+    }
+    const results = await Promise.allSettled(promises);
+    for (const result of results) {
+      if (result.status === "rejected") {
+        import_core24.log.error(`Failed to initialize debug libraries ${result.reason}`)();
+      }
+    }
+    import_core24.log.probe(LOG_LEVEL2 + 1, "DOM is loaded")();
+    const device = new WebGLDevice(props);
+    const message2 = `Created ${device.type}${device.debug ? " debug" : ""} context: ${device.info.vendor}, ${device.info.renderer} for canvas: ${device.canvasContext.id}`;
+    import_core24.log.probe(LOG_LEVEL2, message2)();
+    import_core24.log.table(LOG_LEVEL2, device.info)();
+    import_core24.log.groupEnd(LOG_LEVEL2)();
+    return device;
+  }
+};
+function isWebGL(gl) {
+  if (typeof WebGL2RenderingContext !== "undefined" && gl instanceof WebGL2RenderingContext) {
+    return true;
+  }
+  return Boolean(gl && Number.isFinite(gl._version));
+}
+var webgl2Adapter = new WebGLAdapter();
+
+// dist/deprecated/accessor.js
+var import_core25 = require("@luma.gl/core");
+var import_constants28 = require("@luma.gl/constants");
+var DEFAULT_ACCESSOR_VALUES = {
+  offset: 0,
+  stride: 0,
+  type: 5126,
+  size: 1,
+  divisor: 0,
+  normalized: false,
+  integer: false
+};
+var Accessor = class {
+  offset;
+  stride;
+  type;
+  size;
+  divisor;
+  normalized;
+  integer;
+  buffer;
+  index;
+  static getBytesPerElement(accessor) {
+    const ArrayType = getTypedArrayFromGLType2(accessor.type || 5126);
+    return ArrayType.BYTES_PER_ELEMENT;
+  }
+  static getBytesPerVertex(accessor) {
+    const ArrayType = getTypedArrayFromGLType2(accessor.type || 5126);
+    return ArrayType.BYTES_PER_ELEMENT * accessor.size;
+  }
+  // Combines (merges) a list of accessors. On top of default values
+  // Usually [programAccessor, bufferAccessor, appAccessor]
+  // All props will be set in the returned object.
+  // TODO check for conflicts between values in the supplied accessors
+  static resolve(...accessors) {
+    return new Accessor(...[DEFAULT_ACCESSOR_VALUES, ...accessors]);
+  }
+  constructor(...accessors) {
+    import_core25.log.warn("Accessor will be removed in next minor release");
+    accessors.forEach((accessor) => this._assign(accessor));
+    Object.freeze(this);
+  }
+  toString() {
+    return JSON.stringify(this);
+  }
+  // ACCESSORS
+  // TODO - remove>
+  get BYTES_PER_ELEMENT() {
+    return Accessor.getBytesPerElement(this);
+  }
+  get BYTES_PER_VERTEX() {
+    return Accessor.getBytesPerVertex(this);
+  }
+  // PRIVATE
+  // eslint-disable-next-line complexity, max-statements
+  _assign(props = {}) {
+    if (props.type !== void 0) {
+      this.type = props.type;
+      if (props.type === 5124 || props.type === 5125) {
+        this.integer = true;
+      }
+    }
+    if (props.size !== void 0) {
+      this.size = props.size;
+    }
+    if (props.offset !== void 0) {
+      this.offset = props.offset;
+    }
+    if (props.stride !== void 0) {
+      this.stride = props.stride;
+    }
+    if (props.normalize !== void 0) {
+      this.normalized = props.normalize;
+    }
+    if (props.normalized !== void 0) {
+      this.normalized = props.normalized;
+    }
+    if (props.integer !== void 0) {
+      this.integer = props.integer;
+    }
+    if (props.divisor !== void 0) {
+      this.divisor = props.divisor;
+    }
+    if (props.buffer !== void 0) {
+      this.buffer = props.buffer;
+    }
+    if (props.index !== void 0) {
+      if (typeof props.index === "boolean") {
+        this.index = props.index ? 1 : 0;
+      } else {
+        this.index = props.index;
+      }
+    }
+    if (props.instanced !== void 0) {
+      this.divisor = props.instanced ? 1 : 0;
+    }
+    if (props.isInstanced !== void 0) {
+      this.divisor = props.isInstanced ? 1 : 0;
+    }
+    if (this.offset === void 0)
+      delete this.offset;
+    if (this.stride === void 0)
+      delete this.stride;
+    if (this.type === void 0)
+      delete this.type;
+    if (this.size === void 0)
+      delete this.size;
+    if (this.divisor === void 0)
+      delete this.divisor;
+    if (this.normalized === void 0)
+      delete this.normalized;
+    if (this.integer === void 0)
+      delete this.integer;
+    if (this.buffer === void 0)
+      delete this.buffer;
+    if (this.index === void 0)
+      delete this.index;
+    return this;
+  }
+};
+function getTypedArrayFromGLType2(glType, options) {
+  const { clamped = true } = options || {};
+  switch (glType) {
+    case 5126:
+      return Float32Array;
+    case 5123:
+    case 33635:
+    case 32819:
+    case 32820:
+      return Uint16Array;
+    case 5125:
+      return Uint32Array;
+    case 5121:
+      return clamped ? Uint8ClampedArray : Uint8Array;
+    case 5120:
+      return Int8Array;
+    case 5122:
+      return Int16Array;
+    case 5124:
+      return Int32Array;
+    default:
+      throw new Error("Failed to deduce typed array type from GL constant");
+  }
+}
 //# sourceMappingURL=index.cjs.map