@luma.gl/webgl 9.1.0-beta.8 → 9.2.0-alpha.1

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

@@ -102,7 +102,7 @@ export class WEBGLTransformFeedback extends TransformFeedback {
     return location >= 0 ? this.buffers[location] : null;
   }
 
-  bind(funcOrHandle = this.handle) {
+  bind(funcOrHandle: (() => void) | WebGLTransformFeedback | null = this.handle) {
     if (typeof funcOrHandle !== 'function') {
       this.gl.bindTransformFeedback(GL.TRANSFORM_FEEDBACK, funcOrHandle);
       return this;
@@ -148,7 +148,7 @@ export class WEBGLTransformFeedback extends TransformFeedback {
       return Number(locationOrName);
     }
 
-    for (const varying of this.layout.varyings) {
+    for (const varying of this.layout.varyings || []) {
       if (locationOrName === varying.name) {
         return varying.location;
       }

package/src/adapter/resources/webgl-vertex-array.ts

@@ -11,7 +11,7 @@ import {getBrowser} from '@probe.gl/env';
 import {WebGLDevice} from '../webgl-device';
 import {WEBGLBuffer} from '../resources/webgl-buffer';
 
-import {getGLFromVertexType} from '../converters/vertex-formats';
+import {getGLFromVertexType} from '../converters/webgl-vertex-formats';
 import {fillArray} from '../../utils/fill-array';
 
 /** VertexArrayObject wrapper */
@@ -25,7 +25,7 @@ export class WEBGLVertexArray extends VertexArray {
 
   /** Attribute 0 buffer constant */
   private buffer: WEBGLBuffer | null = null;
-  private bufferValue = null;
+  private bufferValue: TypedArray | null = null;
 
   /** * Attribute 0 can not be disable on most desktop OpenGL based browsers */
   static isConstantAttributeZeroSupported(device: Device): boolean {
@@ -233,7 +233,8 @@ export class WEBGLVertexArray extends VertexArray {
     this.buffer = this.buffer || this.device.createBuffer({byteLength});
 
     // Reallocate and update contents if needed
-    updateNeeded = updateNeeded || !compareConstantArrayValues(constantValue, this.bufferValue);
+    // @ts-ignore TODO fix types
+    updateNeeded ||= !compareConstantArrayValues(constantValue, this.bufferValue);
 
     if (updateNeeded) {
       // Create a typed array that is big enough, and fill it with the required data

package/src/adapter/webgl-adapter.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
+import type {WebGLDevice} from './webgl-device';
 import {Adapter, Device, DeviceProps, log} from '@luma.gl/core';
-import {WebGLDevice} from './webgl-device';
 import {enforceWebGL2} from '../context/polyfills/polyfill-webgl1-extensions';
 import {loadSpectorJS, DEFAULT_SPECTOR_PROPS} from '../context/debug/spector';
 import {loadWebGLDeveloperTools} from '../context/debug/webgl-developer-tools';
@@ -16,12 +16,13 @@ export class WebGLAdapter extends Adapter {
 
   constructor() {
     super();
-
     // Add spector default props to device default props, so that runtime settings are observed
     Device.defaultProps = {...Device.defaultProps, ...DEFAULT_SPECTOR_PROPS};
+  }
 
-    // @ts-ignore DEPRECATED For backwards compatibility luma.registerDevices
-    WebGLDevice.adapter = this;
+  /** Force any created WebGL contexts to be WebGL2 contexts, polyfilled with WebGL1 extensions */
+  enforceWebGL2(enable: boolean): void {
+    enforceWebGL2(enable);
   }
 
   /** Check if WebGL 2 is available */
@@ -29,9 +30,17 @@ export class WebGLAdapter extends Adapter {
     return typeof WebGL2RenderingContext !== 'undefined';
   }
 
-  /** Force any created WebGL contexts to be WebGL2 contexts, polyfilled with WebGL1 extensions */
-  enforceWebGL2(enable: boolean): void {
-    enforceWebGL2(enable);
+  override isDeviceHandle(handle: unknown): boolean {
+    // WebGL
+    if (typeof WebGL2RenderingContext !== 'undefined' && handle instanceof WebGL2RenderingContext) {
+      return true;
+    }
+
+    if (typeof WebGLRenderingContext !== 'undefined' && handle instanceof WebGLRenderingContext) {
+      log.warn('WebGL1 is not supported', handle)();
+    }
+
+    return false;
   }
 
   /**
@@ -41,11 +50,12 @@ export class WebGLAdapter extends Adapter {
    * @returns
    */
   async attach(gl: Device | WebGL2RenderingContext): Promise<WebGLDevice> {
+    const {WebGLDevice} = await import('./webgl-device');
     if (gl instanceof WebGLDevice) {
       return gl;
     }
     // @ts-expect-error
-    if (gl?.device instanceof Device) {
+    if (gl?.device instanceof WebGLDevice) {
       // @ts-expect-error
       return gl.device as WebGLDevice;
     }
@@ -56,6 +66,8 @@ export class WebGLAdapter extends Adapter {
   }
 
   async create(props: DeviceProps = {}): Promise<WebGLDevice> {
+    const {WebGLDevice} = await import('./webgl-device');
+
     log.groupCollapsed(LOG_LEVEL, 'WebGLDevice created')();
 
     const promises: Promise<unknown>[] = [];

package/src/adapter/webgl-canvas-context.ts

@@ -27,7 +27,7 @@ export class WebGLCanvasContext extends CanvasContext {
 
     // Base class constructor cannot access derived methods/fields, so we need to call these functions in the subclass constructor
     this._setAutoCreatedCanvasId(`${this.device.id}-canvas`);
-    this.updateSize([this.drawingBufferWidth, this.drawingBufferHeight]);
+    this._updateDevice();
   }
 
   getCurrentFramebuffer(): WEBGLFramebuffer {
@@ -36,36 +36,7 @@ export class WebGLCanvasContext extends CanvasContext {
     return this._framebuffer;
   }
 
-  updateSize(size: [number, number]): void {}
+  // IMPLEMENTATION OF ABSTRACT METHODS
 
-  /**
-   * Resize the canvas' drawing buffer.
-   *
-   * Can match the canvas CSS size, and optionally also consider devicePixelRatio
-   * Can be called every frame
-   *
-   * Regardless of size, the drawing buffer will always be scaled to the viewport, but
-   * for best visual results, usually set to either:
-   *  canvas CSS width x canvas CSS height
-   *  canvas CSS width * devicePixelRatio x canvas CSS height * devicePixelRatio
-   * See http://webgl2fundamentals.org/webgl/lessons/webgl-resizing-the-canvas.html
-   */
-  resize(options?: {width?: number; height?: number; useDevicePixels?: boolean | number}): void {
-    if (!this.device.gl) return;
-
-    // Resize browser context. TODO - this likely needs to be rewritten
-    if (this.canvas) {
-      const devicePixelRatio = this.getDevicePixelRatio(options?.useDevicePixels);
-      this._setDevicePixelRatio(devicePixelRatio, options);
-      return;
-    }
-  }
-
-  commit() {
-    // gl.commit was ultimately removed from the WebGL standard??
-    // if (this.offScreen && this.gl.commit) {
-    //   // @ts-expect-error gl.commit is not officially part of WebGL2RenderingContext
-    //   this.gl.commit();
-    // }
-  }
+  _updateDevice(): void {}
 }

package/src/adapter/webgl-device.ts

@@ -25,10 +25,6 @@ import type {
   RenderPipelineProps,
   ComputePipeline,
   ComputePipelineProps,
-  // RenderPass,
-  RenderPassProps,
-  ComputePass,
-  ComputePassProps,
   // CommandEncoder,
   CommandEncoderProps,
   TransformFeedbackProps,
@@ -54,9 +50,9 @@ import {WEBGLShader} from './resources/webgl-shader';
 import {WEBGLSampler} from './resources/webgl-sampler';
 import {WEBGLTexture} from './resources/webgl-texture';
 import {WEBGLFramebuffer} from './resources/webgl-framebuffer';
-import {WEBGLRenderPass} from './resources/webgl-render-pass';
 import {WEBGLRenderPipeline} from './resources/webgl-render-pipeline';
 import {WEBGLCommandEncoder} from './resources/webgl-command-encoder';
+import {WEBGLCommandBuffer} from './resources/webgl-command-buffer';
 import {WEBGLVertexArray} from './resources/webgl-vertex-array';
 import {WEBGLTransformFeedback} from './resources/webgl-transform-feedback';
 import {WEBGLQuerySet} from './resources/webgl-query-set';
@@ -87,6 +83,8 @@ export class WebGLDevice extends Device {
   readonly preferredColorFormat = 'rgba8unorm';
   readonly preferredDepthFormat = 'depth24plus';
 
+  commandEncoder: WEBGLCommandEncoder;
+
   readonly lost: Promise<{reason: 'destroyed'; message: string}>;
 
   private _resolveContextLost?: (value: {reason: 'destroyed'; message: string}) => void;
@@ -95,20 +93,25 @@ export class WebGLDevice extends Device {
   readonly gl: WebGL2RenderingContext;
   readonly debug: boolean = false;
 
-  /** State used by luma.gl classes: TODO - move to canvasContext*/
-  readonly _canvasSizeInfo = {clientWidth: 0, clientHeight: 0, devicePixelRatio: 1};
+  /** Store constants */
+  // @ts-ignore TODO fix
+  _constants: (TypedArray | null)[];
 
   /** State used by luma.gl classes - TODO - not used? */
   readonly _extensions: GLExtensions = {};
   _polyfilled: boolean = false;
 
   /** Instance of Spector.js (if initialized) */
-  spectorJS: Spector;
+  spectorJS: Spector | null;
 
   //
   // Public API
   //
 
+  override toString(): string {
+    return `${this[Symbol.toStringTag]}(${this.id})`;
+  }
+
   constructor(props: DeviceProps) {
     super({...props, id: props.id || uid('webgl-device')});
 
@@ -205,6 +208,8 @@ export class WebGLDevice extends Device {
         log.level = Math.max(log.level, 1);
       }
     }
+
+    this.commandEncoder = new WEBGLCommandEncoder(this, {id: `${this}-command-encoder`});
   }
 
   /**
@@ -264,20 +269,10 @@ export class WebGLDevice extends Device {
     return new WEBGLRenderPipeline(this, props);
   }
 
-  beginRenderPass(props: RenderPassProps): WEBGLRenderPass {
-    return new WEBGLRenderPass(this, props);
-  }
-
   createComputePipeline(props?: ComputePipelineProps): ComputePipeline {
     throw new Error('ComputePipeline not supported in WebGL');
   }
 
-  beginComputePass(props: ComputePassProps): ComputePass {
-    throw new Error('ComputePass not supported in WebGL');
-  }
-
-  private renderPass: WEBGLRenderPass | null = null;
-
   override createCommandEncoder(props: CommandEncoderProps = {}): WEBGLCommandEncoder {
     return new WEBGLCommandEncoder(this, props);
   }
@@ -287,10 +282,14 @@ export class WebGLDevice extends Device {
    * https://developer.mozilla.org/en-US/docs/Web/API/WebGL2RenderingContext/commit
    * Chrome's offscreen canvas does not require gl.commit
    */
-  submit(): void {
-    this.renderPass?.end();
-    this.renderPass = null;
-    // this.canvasContext.commit();
+  submit(commandBuffer: WEBGLCommandBuffer): void {
+    if (!commandBuffer) {
+      commandBuffer = this.commandEncoder.finish();
+      this.commandEncoder.destroy();
+      this.commandEncoder = this.createCommandEncoder({id: `${this.id}-default-encoder`});
+    }
+
+    commandBuffer._executeCommands();
   }
 
   //
@@ -421,9 +420,6 @@ export class WebGLDevice extends Device {
     }, {});
   }
 
-  /** Store constants */
-  _constants: (TypedArray | null)[];
-
   /**
    * Set a constant value for a location. Disabled attributes at that location will read from this value
    * @note WebGL constants are stored globally on the WebGL context, not the VertexArray

package/src/context/debug/spector-types.ts

@@ -1,6 +1,8 @@
 // Forked from https://github.com/BabylonJS/Spector.js/blob/master/dist/spector.d.ts
 /* eslint-disable camelcase, no-shadow */
 
+// @ts-nocheck
+
 interface IEvent<T> {
   add(callback: (element: T) => void, context?: any): number;
   remove(id: number): void;
@@ -1071,8 +1073,11 @@ export abstract class Spector {
   }
   protected static tryGetContextFromHelperField: unknown;
   protected static tryGetContextFromCanvas: unknown;
+  // @ts-ignore TODO
   readonly onCaptureStarted: IEvent<any>;
+  // @ts-ignore TODO
   readonly onCapture: IEvent<ICapture>;
+  // @ts-ignore TODO
   readonly onError: IEvent<string>;
   protected readonly logger;
   protected readonly timeSpy;

package/src/context/debug/spector.ts

@@ -19,7 +19,7 @@ type SpectorProps = {
 
 const LOG_LEVEL = 1;
 
-let spector: Spector = null;
+let spector: Spector | null = null;
 let initialized: boolean = false;
 
 declare global {

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

@@ -112,7 +112,7 @@ function getDebugContext(
 
 // DEBUG TRACING
 
-function getFunctionString(functionName: string, functionArgs): string {
+function getFunctionString(functionName: string, functionArgs: unknown[]): string {
   // Cover bug in webgl-debug-tools
   functionArgs = Array.from(functionArgs).map(arg => (arg === undefined ? 'undefined' : arg));
   let args = globalThis.WebGLDebugUtils.glFunctionArgsToString(functionName, functionArgs);
@@ -120,7 +120,12 @@ function getFunctionString(functionName: string, functionArgs): string {
   return `gl.${functionName}(${args})`;
 }
 
-function onGLError(props: DebugContextProps, err, functionName: string, args: any[]): void {
+function onGLError(
+  props: DebugContextProps,
+  err: number,
+  functionName: string,
+  args: unknown[]
+): void {
   // Cover bug in webgl-debug-tools
   args = Array.from(args).map(arg => (arg === undefined ? 'undefined' : arg));
   const errorMessage = globalThis.WebGLDebugUtils.glEnumToString(err);
@@ -135,7 +140,7 @@ function onGLError(props: DebugContextProps, err, functionName: string, args: an
 function onValidateGLFunc(
   props: DebugContextProps,
   functionName: string,
-  functionArgs: any[]
+  functionArgs: unknown[]
 ): void {
   let functionString: string = '';
   if (log.level >= 1) {

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

@@ -10,8 +10,11 @@ export function getWebGLExtension(
   name: string,
   extensions: GLExtensions
 ): unknown {
+  // @ts-ignore TODO
   if (extensions[name] === undefined) {
+    // @ts-ignore TODO
     extensions[name] = gl.getExtension(name) || null;
   }
+  // @ts-ignore TODO
   return extensions[name];
 }

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

@@ -32,16 +32,19 @@ export function setGLParameters(gl: WebGL2RenderingContext, parameters: GLParame
 
   for (const key in parameters) {
     const glConstant = Number(key);
+    // @ts-ignore TODO
     const setter = GL_PARAMETER_SETTERS[key];
     if (setter) {
       // Composite setters should only be called once, so save them
       if (typeof setter === 'string') {
+        // @ts-ignore TODO
         compositeSetters[setter] = true;
       } else {
         // if (gl[glConstant] !== undefined) {
         // TODO - added above check since this is being called on WebGL2 parameters in WebGL1...
         // TODO - deep equal on values? only call setter if value has changed?
         // NOTE - the setter will automatically update this.state
+        // @ts-ignore TODO
         setter(gl, parameters[key], glConstant);
       }
     }
@@ -59,6 +62,7 @@ export function setGLParameters(gl: WebGL2RenderingContext, parameters: GLParame
   if (cache) {
     for (const key in compositeSetters) {
       // TODO - avoid calling composite setters if values have not changed.
+      // @ts-ignore TODO
       const compositeSetter = GL_COMPOSITE_PARAMETER_SETTERS[key];
       // Note - if `trackContextState` has been called,
       // the setter will automatically update this.state.cache
@@ -92,15 +96,18 @@ export function getGLParameters(
   if (typeof parameters === 'number') {
     // single GL enum
     const key = parameters;
+    // @ts-ignore TODO
     const getter = GL_PARAMETER_GETTERS[key];
     return getter ? getter(gl, key) : gl.getParameter(key);
   }
 
   const parameterKeys = Array.isArray(parameters) ? parameters : Object.keys(parameters);
 
-  const state = {};
+  const state: GLParameters = {};
   for (const key of parameterKeys) {
+    // @ts-ignore TODO
     const getter = GL_PARAMETER_GETTERS[key];
+    // @ts-ignore TODO
     state[key] = getter ? getter(gl, Number(key)) : gl.getParameter(Number(key));
   }
   return state;
@@ -119,7 +126,7 @@ export function resetGLParameters(gl: WebGL2RenderingContext): void {
 // Helpers
 
 // Returns true if given object is empty, false otherwise.
-function isObjectEmpty(object) {
+function isObjectEmpty(object: Record<string, unknown>): boolean {
   // @ts-ignore dummy key variable
   for (const key in object) {
     return false;

package/src/context/parameters/webgl-parameter-tables.ts

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
+// @ts-nocheck TODO fix
+
 // Tables describing WebGL parameters
 import {GL, GLParameters} from '@luma.gl/constants';
 

package/src/context/polyfills/polyfill-webgl1-extensions.ts

@@ -132,6 +132,7 @@ export function polyfillWebGL1Extensions(gl: WebGL2RenderingContext): void {
 
     // Injected extensions
     if (extensionName in boundExtensions) {
+      // @ts-ignore TODO string index
       return boundExtensions[extensionName];
     }
 

package/src/context/state-tracker/deep-array-equal.ts

@@ -2,16 +2,17 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
+import {TypedArray} from '@luma.gl/core';
+
 /** deeply compare two arrays */
-export function deepArrayEqual(x: any, y: any): boolean {
+export function deepArrayEqual(
+  x: unknown | unknown[] | TypedArray,
+  y: unknown | unknown[] | TypedArray
+): boolean {
   if (x === y) {
     return true;
   }
-  const isArrayX = Array.isArray(x) || ArrayBuffer.isView(x);
-  const isArrayY = Array.isArray(y) || ArrayBuffer.isView(y);
-  // @ts-expect-error TODO fix
-  if (isArrayX && isArrayY && x.length === y.length) {
-    // @ts-expect-error TODO fix
+  if (isArray(x) && isArray(y) && x.length === y.length) {
     for (let i = 0; i < x.length; ++i) {
       if (x[i] !== y[i]) {
         return false;
@@ -21,3 +22,7 @@ export function deepArrayEqual(x: any, y: any): boolean {
   }
   return false;
 }
+
+function isArray(x: unknown): x is unknown[] {
+  return Array.isArray(x) || ArrayBuffer.isView(x);
+}

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

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
+// @ts-nocheck TODO - fix
+
 import {setGLParameters, getGLParameters} from '../parameters/unified-parameter-api';
 import {deepArrayEqual} from './deep-array-equal';
 import {
@@ -66,7 +68,9 @@ export class WebGLStateTracker {
    * temporarily modifying, and then restoring state.
    */
   trackState(gl: WebGL2RenderingContext, options?: {copyState?: boolean}): void {
-    this.cache = options.copyState ? getGLParameters(gl) : Object.assign({}, GL_PARAMETER_DEFAULTS);
+    this.cache = options?.copyState
+      ? getGLParameters(gl)
+      : Object.assign({}, GL_PARAMETER_DEFAULTS);
 
     if (this.initialized) {
       throw new Error('WebGLStateTracker');

package/src/context/state-tracker/with-parameters.ts

@@ -51,7 +51,7 @@ export function withGLParameters(
 // Helpers
 
 // Returns true if given object is empty, false otherwise.
-function isObjectEmpty(object) {
+function isObjectEmpty(object: unknown): boolean {
   // @ts-ignore - dummy key variable
   for (const key in object) {
     return false;

package/src/index.ts

@@ -37,16 +37,12 @@ export {WEBGLVertexArray} from './adapter/resources/webgl-vertex-array';
 // WebGL adapter classes
 export {WEBGLTransformFeedback} from './adapter/resources/webgl-transform-feedback';
 
-// WebGL adapter classes
-export {Accessor} from './deprecated/accessor';
-export type {AccessorObject} from './types';
-
 // Unified parameter API
 
 export {setDeviceParameters, withDeviceParameters} from './adapter/converters/device-parameters';
 
 // HELPERS - EXPERIMENTAL
-export {getShaderLayoutFromGLSL} from './adapter/helpers/get-shader-layout';
+export {getShaderLayoutFromGLSL} from './adapter/helpers/get-shader-layout-from-glsl';
 export {WebGLStateTracker} from './context/state-tracker/webgl-state-tracker';
 
 // DEPRECATED TEST EXPORTS

package/dist/adapter/converters/vertex-formats.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"vertex-formats.d.ts","sourceRoot":"","sources":["../../../src/adapter/converters/vertex-formats.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,YAAY,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAEvD,KAAK,UAAU,GACX,EAAE,CAAC,aAAa,GAChB,EAAE,CAAC,IAAI,GACP,EAAE,CAAC,cAAc,GACjB,EAAE,CAAC,KAAK,GACR,EAAE,CAAC,YAAY,GACf,EAAE,CAAC,GAAG,GACN,EAAE,CAAC,UAAU,GACb,EAAE,CAAC,KAAK,CAAC;AAEb,0CAA0C;AAC1C,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,YAAY,CAa/F;AAED,sCAAsC;AACtC,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,UAAQ,GAAG,UAAU,CAepF;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,UAAU,GAElB,EAAE,CAAC,aAAa,GAChB,EAAE,CAAC,IAAI,GACP,EAAE,CAAC,cAAc,GACjB,EAAE,CAAC,KAAK,GACR,EAAE,CAAC,YAAY,GACf,EAAE,CAAC,GAAG,GACN,EAAE,CAAC,UAAU,GACb,EAAE,CAAC,KAAK,CAqBX"}

package/dist/adapter/converters/vertex-formats.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"vertex-formats.js","sourceRoot":"","sources":["../../../src/adapter/converters/vertex-formats.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAatC,0CAA0C;AAC1C,MAAM,UAAU,qBAAqB,CAAC,IAAgB,EAAE,UAAyB;IAC/E,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACvC,kBAAkB;IAClB,QAAQ,UAAU,EAAE,CAAC;QACnB,kDAAkD;QAClD,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC;QACpB,KAAK,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,IAAI,CAAC;QAC3B,kDAAkD;QAClD,KAAK,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,IAAI,CAAC;QAC3B,KAAK,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,IAAI,CAAC;IAC7B,CAAC;IACD,yBAAyB;IACzB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;AACtC,CAAC;AAED,sCAAsC;AACtC,MAAM,UAAU,mBAAmB,CAAC,IAAgB,EAAE,UAAU,GAAG,KAAK;IACtE,kBAAkB;IAClB,QAAQ,IAAI,EAAE,CAAC;QACb,+DAA+D;QAC/D,WAAa,OAAO,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;QACrD,WAAsB,OAAO,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC9D,WAAe,OAAO,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;QACxD,WAAwB,OAAO,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;QACjE,WAAc,OAAO,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QACtD,WAAuB,OAAO,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC9D,WAAe,OAAO,SAAS,CAAC;QAChC,WAAoB,OAAO,SAAS,CAAC;IACvC,CAAC;IACD,yBAAyB;IACzB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,QAAoB;IAUpB,kBAAkB;IAClB,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,OAAO,CAAC,CAAC,YAAwB;QACtC,KAAK,OAAO,CAAC,CAAC,YAAe;QAC7B,KAAK,QAAQ,CAAC,CAAC,YAAwB;QACvC,KAAK,QAAQ,CAAC,CAAC,YAAe;QAC9B,KAAK,QAAQ,CAAC,CAAC,YAAyB;QACxC,KAAK,QAAQ,CAAC,CAAC,YAAgB;QAC/B,KAAK,SAAS,CAAC,CAAC,YAAyB;QACzC,KAAK,SAAS,CAAC,CAAC,YAAgB;QAChC,KAAK,QAAQ,CAAC,CAAC,YAAuB;QACtC,KAAK,QAAQ,CAAC,CAAC,YAAc;QAC7B,+DAA+D;QAC/D,0CAA0C;QAC1C,iCAAiC;QACjC,KAAK,SAAS,CAAC,CAAC,YAAqB;QACrC,KAAK,SAAS,CAAC,CAAC,YAAgB;IAClC,CAAC;IACD,yBAAyB;IACzB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;AACpC,CAAC"}

package/dist/adapter/helpers/decode-webgl-types.d.ts

@@ -1,26 +0,0 @@
-import { ShaderUniformType, ShaderAttributeType, VertexFormat } from '@luma.gl/core';
-import { GL, GLUniformType, GLCompositeType, GLDataType } from '@luma.gl/constants';
-/** Check is uniform is of sampler type */
-export declare function isSamplerUniform(type: GLUniformType): boolean;
-/** Decomposes a composite type (GL.VEC3) into a basic type (GL.FLOAT) and components (3) */
-export declare function decodeGLUniformType(glUniformType: GL): {
-    format: ShaderUniformType;
-    components: number;
-    glType: GLDataType;
-};
-/** Decomposes a composite type (GL.VEC3) into a basic type (GL.FLOAT) and components (3) */
-export declare function decodeGLAttributeType(glAttributeType: GL): {
-    attributeType: ShaderAttributeType;
-    vertexFormat: VertexFormat;
-    components: number;
-};
-/** Decomposes a composite type GL.VEC3 into a basic type (GL.FLOAT) and components (3) */
-export declare function decomposeCompositeGLDataType(compositeGLDataType: GLCompositeType): {
-    type: GLDataType;
-    components: number;
-} | null;
-export declare function getCompositeGLDataType(type: GL, components: any): {
-    glType: GLDataType;
-    name: string;
-} | null;
-//# sourceMappingURL=decode-webgl-types.d.ts.map

package/dist/adapter/helpers/decode-webgl-types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"decode-webgl-types.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/decode-webgl-types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACnF,OAAO,EAAC,EAAE,EAAE,aAAa,EAAiB,eAAe,EAAE,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAEjG,0CAA0C;AAC1C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAE7D;AA2DD,4FAA4F;AAC5F,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,EAAE,GAAG;IACtD,MAAM,EAAE,iBAAiB,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;CACpB,CAOA;AAED,4FAA4F;AAC5F,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,EAAE,GAAG;IAC1D,aAAa,EAAE,mBAAmB,CAAC;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;CAEpB,CASA;AAED,0FAA0F;AAC1F,wBAAgB,4BAA4B,CAC1C,mBAAmB,EAAE,eAAe,GACnC;IAAC,IAAI,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAC,GAAG,IAAI,CAO/C;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,EAAE,EACR,UAAU,KAAA,GACT;IAAC,MAAM,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,GAAG,IAAI,CAkB3C"}

package/dist/adapter/helpers/decode-webgl-types.js

@@ -1,102 +0,0 @@
-// luma.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-import { GL } from '@luma.gl/constants';
-/** Check is uniform is of sampler type */
-export function isSamplerUniform(type) {
-    return SAMPLER_TYPES.includes(type);
-}
-const SAMPLER_TYPES = [
-    35678,
-    35680,
-    35679,
-    35682,
-    36289,
-    36292,
-    36293,
-    36298,
-    36299,
-    36300,
-    36303,
-    36306,
-    36307,
-    36308,
-    36311
-];
-// Composite types table
-const COMPOSITE_GL_TYPES = {
-    [5126]: [5126, 1, 'float', 'f32', 'float32'],
-    [35664]: [5126, 2, 'vec2', 'vec2<f32>', 'float32x2'],
-    [35665]: [5126, 3, 'vec3', 'vec3<f32>', 'float32x3'],
-    [35666]: [5126, 4, 'vec4', 'vec4<f32>', 'float32x4'],
-    [5124]: [5124, 1, 'int', 'i32', 'sint32'],
-    [35667]: [5124, 2, 'ivec2', 'vec2<i32>', 'sint32x2'],
-    [35668]: [5124, 3, 'ivec3', 'vec3<i32>', 'sint32x3'],
-    [35669]: [5124, 4, 'ivec4', 'vec4<i32>', 'sint32x4'],
-    [5125]: [5125, 1, 'uint', 'u32', 'uint32'],
-    [36294]: [5125, 2, 'uvec2', 'vec2<u32>', 'uint32x2'],
-    [36295]: [5125, 3, 'uvec3', 'vec3<u32>', 'uint32x3'],
-    [36296]: [5125, 4, 'uvec4', 'vec4<u32>', 'uint32x4'],
-    [35670]: [5126, 1, 'bool', 'f32', 'float32'],
-    [35671]: [5126, 2, 'bvec2', 'vec2<f32>', 'float32x2'],
-    [35672]: [5126, 3, 'bvec3', 'vec3<f32>', 'float32x3'],
-    [35673]: [5126, 4, 'bvec4', 'vec4<f32>', 'float32x4'],
-    // TODO - are sizes/components below correct?
-    [35674]: [5126, 8, 'mat2', 'mat2x2<f32>'], // 4
-    [35685]: [5126, 8, 'mat2x3', 'mat2x3<f32>'], // 6
-    [35686]: [5126, 8, 'mat2x4', 'mat2x4<f32>'], // 8
-    [35687]: [5126, 12, 'mat3x2', 'mat3x2<f32>'], // 6
-    [35675]: [5126, 12, 'mat3', 'mat3x3<f32>'], // 9
-    [35688]: [5126, 12, 'mat3x4', 'mat3x4<f32>'], // 12
-    [35689]: [5126, 16, 'mat4x2', 'mat4x2<f32>'], // 8
-    [35690]: [5126, 16, 'mat4x3', 'mat4x3<f32>'], // 12
-    [35676]: [5126, 16, 'mat4', 'mat4x4<f32>'] // 16
-};
-/** Decomposes a composite type (GL.VEC3) into a basic type (GL.FLOAT) and components (3) */
-export function decodeGLUniformType(glUniformType) {
-    const typeAndSize = COMPOSITE_GL_TYPES[glUniformType];
-    if (!typeAndSize) {
-        throw new Error('uniform');
-    }
-    const [glType, components, , format] = typeAndSize;
-    return { format, components, glType };
-}
-/** Decomposes a composite type (GL.VEC3) into a basic type (GL.FLOAT) and components (3) */
-export function decodeGLAttributeType(glAttributeType) {
-    const typeAndSize = COMPOSITE_GL_TYPES[glAttributeType];
-    if (!typeAndSize) {
-        throw new Error('attribute');
-    }
-    const [, components, , shaderType, vertexFormat] = typeAndSize;
-    // TODO sanity - if (shaderType.startsWith('mat' ...))
-    const attributeType = shaderType;
-    return { attributeType, vertexFormat, components }; // , glType};
-}
-/** Decomposes a composite type GL.VEC3 into a basic type (GL.FLOAT) and components (3) */
-export function decomposeCompositeGLDataType(compositeGLDataType) {
-    const typeAndSize = COMPOSITE_GL_TYPES[compositeGLDataType];
-    if (!typeAndSize) {
-        return null;
-    }
-    const [type, components] = typeAndSize;
-    return { type, components };
-}
-export function getCompositeGLDataType(type, components) {
-    switch (type) {
-        case 5120:
-        case 5121:
-        case 5122:
-        case 5123:
-            type = 5126;
-            break;
-        default:
-    }
-    for (const glType in COMPOSITE_GL_TYPES) {
-        const [compType, compComponents, name] = COMPOSITE_GL_TYPES[glType];
-        if (compType === type && compComponents === components) {
-            return { glType: Number(glType), name };
-        }
-    }
-    return null;
-}
-//# sourceMappingURL=decode-webgl-types.js.map