@luma.gl/webgl 9.0.0-beta.5 → 9.0.0-beta.7

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

@@ -1,10 +1,11 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {log, loadScript} from '@luma.gl/core';
 // Rename constant to prevent inlining. We need the full set of constants for generating debug strings.
 import {GL as GLEnum} from '@luma.gl/constants';
-import {isBrowser} from '@probe.gl/env'
+import {isBrowser} from '@probe.gl/env';
 
 const WEBGL_DEBUG_CDN_URL = 'https://unpkg.com/webgl-debug@2.0.1/index.js';
 
@@ -24,10 +25,10 @@ type DebugContextProps = {
 type ContextData = {
   realContext?: WebGL2RenderingContext;
   debugContext?: WebGL2RenderingContext;
-}
+};
 
 // Helper to get shared context data
-function getContextData(gl: any): ContextData {
+function getWebGLContextData(gl: any): ContextData {
   gl.luma = gl.luma || {};
   return gl.luma;
 }
@@ -38,7 +39,7 @@ declare global {
 }
 
 /**
- * Loads Khronos WebGLDeveloperTools from CDN if not already installed 
+ * Loads Khronos WebGLDeveloperTools from CDN if not already installed
  * const WebGLDebugUtils = require('webgl-debug');
  * @see https://github.com/KhronosGroup/WebGLDeveloperTools
  * @see https://github.com/vorg/webgl-debug
@@ -54,7 +55,10 @@ export async function loadWebGLDeveloperTools(): Promise<void> {
 
 // Returns (a potentially new) context with debug instrumentation turned off or on.
 // Note that this actually returns a new context
-export function makeDebugContext(gl: WebGL2RenderingContext, props: DebugContextProps = {}): WebGL2RenderingContext | null {
+export function makeDebugContext(
+  gl: WebGL2RenderingContext,
+  props: DebugContextProps = {}
+): WebGL2RenderingContext | null {
   // Return null to ensure we don't try to create a context in this case (TODO what case is that?)
   if (!gl) {
     return null;
@@ -65,19 +69,22 @@ export function makeDebugContext(gl: WebGL2RenderingContext, props: DebugContext
 
 // Returns the real context from either of the real/debug contexts
 function getRealContext(gl: WebGL2RenderingContext): WebGL2RenderingContext {
-  const data = getContextData(gl);
+  const data = getWebGLContextData(gl);
   // If the context has a realContext member, it is a debug context so return the realContext
   return data.realContext ? data.realContext : gl;
 }
 
 // Returns the debug context from either of the real/debug contexts
-function getDebugContext(gl: WebGL2RenderingContext, props: DebugContextProps): WebGL2RenderingContext {
+function getDebugContext(
+  gl: WebGL2RenderingContext,
+  props: DebugContextProps
+): WebGL2RenderingContext {
   if (!globalThis.WebGLDebugUtils) {
     log.warn('webgl-debug not loaded')();
     return gl;
   }
 
-  const data = getContextData(gl);
+  const data = getWebGLContextData(gl);
 
   // If this already has a debug context, return it.
   if (data.debugContext) {
@@ -98,7 +105,7 @@ function getDebugContext(gl: WebGL2RenderingContext, props: DebugContextProps):
       glDebug[key] = GLEnum[key];
     }
   }
-  
+
   // Ensure we have a clean prototype on the instrumented object
   // Note: setPrototypeOf does come with perf warnings, but we already take a bigger perf reduction
   // by synchronizing the WebGL errors after each WebGL call.
@@ -119,7 +126,7 @@ function getDebugContext(gl: WebGL2RenderingContext, props: DebugContextProps):
 
 function getFunctionString(functionName: string, functionArgs): string {
   // Cover bug in webgl-debug-tools
-  functionArgs = Array.from(functionArgs).map(arg => arg === undefined ? 'undefined' : arg);
+  functionArgs = Array.from(functionArgs).map(arg => (arg === undefined ? 'undefined' : arg));
   let args = globalThis.WebGLDebugUtils.glFunctionArgsToString(functionName, functionArgs);
   args = `${args.slice(0, 100)}${args.length > 100 ? '...' : ''}`;
   return `gl.${functionName}(${args})`;
@@ -127,7 +134,7 @@ function getFunctionString(functionName: string, functionArgs): string {
 
 function onGLError(props: DebugContextProps, err, functionName: string, args: any[]): void {
   // Cover bug in webgl-debug-tools
-  args = Array.from(args).map(arg => arg === undefined ? 'undefined' : arg);
+  args = Array.from(args).map(arg => (arg === undefined ? 'undefined' : arg));
   const errorMessage = globalThis.WebGLDebugUtils.glEnumToString(err);
   const functionArgs = globalThis.WebGLDebugUtils.glFunctionArgsToString(functionName, args);
   const message = `${errorMessage} in gl.${functionName}(${functionArgs})`;
@@ -139,7 +146,11 @@ function onGLError(props: DebugContextProps, err, functionName: string, args: an
 }
 
 // Don't generate function string until it is needed
-function onValidateGLFunc(props: DebugContextProps, functionName: string, functionArgs: any[]): void {
+function onValidateGLFunc(
+  props: DebugContextProps,
+  functionName: string,
+  functionArgs: any[]
+): void {
   let functionString: string = '';
   if (log.level >= 1) {
     functionString = getFunctionString(functionName, functionArgs);
@@ -149,7 +160,9 @@ function onValidateGLFunc(props: DebugContextProps, functionName: string, functi
   // If array of breakpoint strings supplied, check if any of them is contained in current GLEnum function
   if (props.break && props.break.length > 0) {
     functionString = functionString || getFunctionString(functionName, functionArgs);
-    const isBreakpoint = props.break.every((breakOn: string) => functionString.indexOf(breakOn) !== -1);
+    const isBreakpoint = props.break.every(
+      (breakOn: string) => functionString.indexOf(breakOn) !== -1
+    );
     if (isBreakpoint) {
       debugger; // eslint-disable-line
     }

package/src/context/{context → helpers}/create-browser-context.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 /**
@@ -64,7 +65,7 @@ export function createBrowserContext(
   // Software GPU
 
   // props.failIfMajorPerformanceCaveat = false;
-  
+
   // if (!gl && props.webgl1) {
   //   gl = canvas.getContext('webgl', props);
   // }

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

@@ -0,0 +1,31 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+/**
+ * Stores luma.gl specific state associated with a context
+ */
+export interface WebGLContextData {
+  _polyfilled: boolean;
+  _extensions: Record<string, any>;
+}
+
+/**
+ * Gets luma.gl specific state from a context
+ * @returns context state
+ */
+export function getWebGLContextData(gl: WebGL2RenderingContext): WebGLContextData {
+  // @ts-expect-error
+  const luma = gl.luma as WebGLContextData | null;
+  if (!luma) {
+    const contextState: WebGLContextData = {
+      _polyfilled: false,
+      _extensions: {}
+    };
+    // @ts-expect-error
+    gl.luma = contextState;
+  }
+
+  // @ts-expect-error
+  return gl.luma;
+}

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

@@ -0,0 +1,17 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import {GLExtensions} from '@luma.gl/constants';
+
+/** Ensure extensions are only requested once */
+export function getWebGLExtension(
+  gl: WebGL2RenderingContext,
+  name: string,
+  extensions: GLExtensions
+): unknown {
+  if (extensions[name] === undefined) {
+    extensions[name] = gl.getExtension(name) || null;
+  }
+  return extensions[name];
+}

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

@@ -1,10 +1,10 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 // Provides a unified API for getting and setting any WebGL parameter
 // Also knows default values of all parameters, enabling fast cache initialization
 // Provides base functionality for the state caching.
-import {Device} from '@luma.gl/core';
 import type {GLParameters} from '@luma.gl/constants';
 import {
   GL_PARAMETER_DEFAULTS,
@@ -13,8 +13,6 @@ import {
   GL_PARAMETER_GETTERS
 } from './webgl-parameter-tables';
 
-import {WebGLDevice} from '../../adapter/webgl-device';
-
 export type {GLParameters};
 
 /**
@@ -23,13 +21,7 @@ export type {GLParameters};
  * @note requires a `cache` object to be set on the context (gl.state.cache)
  * This object is used to fill in any missing values for composite setter functions
  */
-export function setGLParameters(
-  device: Device | WebGL2RenderingContext,
-  parameters: GLParameters
-): void {
-  const webglDevice = WebGLDevice.attach(device);
-  const gl = webglDevice.gl;
-
+export function setGLParameters(gl: WebGL2RenderingContext, parameters: GLParameters): void {
   if (isObjectEmpty(parameters)) {
     return;
   }
@@ -92,12 +84,9 @@ export function setGLParameters(
  * by external code needs to be synchronized for the first time
  */
 export function getGLParameters(
-  device: Device | WebGL2RenderingContext,
+  gl: WebGL2RenderingContext,
   parameters: keyof GLParameters | (keyof GLParameters)[] | GLParameters = GL_PARAMETER_DEFAULTS
 ): GLParameters {
-  const webglDevice = WebGLDevice.attach(device);
-  const gl = webglDevice.gl;
-
   // support both arrays of parameters and objects (keys represent parameters)
 
   if (typeof parameters === 'number') {
@@ -123,8 +112,8 @@ export function getGLParameters(
  * NOT the canvas size dimensions, so they will have to be properly set after
  * calling this function.
  */
-export function resetGLParameters(device: Device | WebGL2RenderingContext): void {
-  setGLParameters(device, GL_PARAMETER_DEFAULTS);
+export function resetGLParameters(gl: WebGL2RenderingContext): void {
+  setGLParameters(gl, GL_PARAMETER_DEFAULTS);
 }
 
 // Helpers

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

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 // Tables describing WebGL parameters
@@ -64,15 +65,7 @@ export const GL_PARAMETER_DEFAULTS: GLParameters = {
   [GL.STENCIL_BACK_PASS_DEPTH_PASS]: GL.KEEP,
   // Dynamic value: We use [0, 0, 1024, 1024] as default, but usually this is updated in each frame.
   [GL.VIEWPORT]: [0, 0, 1024, 1024],
-  // WEBGL1 PIXEL PACK/UNPACK MODES
-  [GL.PACK_ALIGNMENT]: 4,
-  [GL.UNPACK_ALIGNMENT]: 4,
-  [GL.UNPACK_FLIP_Y_WEBGL]: false,
-  [GL.UNPACK_PREMULTIPLY_ALPHA_WEBGL]: false,
-  [GL.UNPACK_COLORSPACE_CONVERSION_WEBGL]: GL.BROWSER_DEFAULT_WEBGL,
 
-  // WEBGL2 / EXTENSIONS
-  // gl1: 'OES_standard_derivatives'
   [GL.TRANSFORM_FEEDBACK_BINDING]: null,
   [GL.COPY_READ_BUFFER_BINDING]: null,
   [GL.COPY_WRITE_BUFFER_BINDING]: null,
@@ -81,6 +74,12 @@ export const GL_PARAMETER_DEFAULTS: GLParameters = {
   [GL.FRAGMENT_SHADER_DERIVATIVE_HINT]: GL.DONT_CARE,
   [GL.READ_FRAMEBUFFER_BINDING]: null,
   [GL.RASTERIZER_DISCARD]: false,
+
+  [GL.PACK_ALIGNMENT]: 4,
+  [GL.UNPACK_ALIGNMENT]: 4,
+  [GL.UNPACK_FLIP_Y_WEBGL]: false,
+  [GL.UNPACK_PREMULTIPLY_ALPHA_WEBGL]: false,
+  [GL.UNPACK_COLORSPACE_CONVERSION_WEBGL]: GL.BROWSER_DEFAULT_WEBGL,
   [GL.PACK_ROW_LENGTH]: 0,
   [GL.PACK_SKIP_PIXELS]: 0,
   [GL.PACK_SKIP_ROWS]: 0,
@@ -100,7 +99,7 @@ const pixelStorei = (gl: WebGL2RenderingContext, value: number | boolean, key: G
   gl.pixelStorei(key, value);
 
 const bindFramebuffer = (gl: WebGL2RenderingContext, value: unknown, key: GL) => {
-  const target = (key === GL.FRAMEBUFFER_BINDING) ? GL.DRAW_FRAMEBUFFER : GL.READ_FRAMEBUFFER;
+  const target = key === GL.FRAMEBUFFER_BINDING ? GL.DRAW_FRAMEBUFFER : GL.READ_FRAMEBUFFER;
   return gl.bindFramebuffer(target, value);
 };
 
@@ -137,13 +136,15 @@ export const GL_PARAMETER_SETTERS = {
   [GL.BLEND_DST_ALPHA]: 'blendFunc',
   [GL.COLOR_CLEAR_VALUE]: (gl: WebGL2RenderingContext, value: [number, number, number, number]) =>
     gl.clearColor(...value),
-  [GL.COLOR_WRITEMASK]: (gl: WebGL2RenderingContext, value: [boolean, boolean, boolean, boolean]) => gl.colorMask(...value),
+  [GL.COLOR_WRITEMASK]: (gl: WebGL2RenderingContext, value: [boolean, boolean, boolean, boolean]) =>
+    gl.colorMask(...value),
   [GL.CULL_FACE]: enable,
   [GL.CULL_FACE_MODE]: (gl: WebGL2RenderingContext, value) => gl.cullFace(value),
   [GL.DEPTH_TEST]: enable,
   [GL.DEPTH_CLEAR_VALUE]: (gl: WebGL2RenderingContext, value) => gl.clearDepth(value),
   [GL.DEPTH_FUNC]: (gl: WebGL2RenderingContext, value) => gl.depthFunc(value),
-  [GL.DEPTH_RANGE]: (gl: WebGL2RenderingContext, value: [number, number]) => gl.depthRange(...value),
+  [GL.DEPTH_RANGE]: (gl: WebGL2RenderingContext, value: [number, number]) =>
+    gl.depthRange(...value),
   [GL.DEPTH_WRITEMASK]: (gl: WebGL2RenderingContext, value) => gl.depthMask(value),
   [GL.DITHER]: enable,
   [GL.FRAGMENT_SHADER_DERIVATIVE_HINT]: hint,
@@ -152,9 +153,8 @@ export const GL_PARAMETER_SETTERS = {
   [GL.RENDERBUFFER_BINDING]: (gl: WebGL2RenderingContext, value) =>
     gl.bindRenderbuffer(GL.RENDERBUFFER, value),
   [GL.TRANSFORM_FEEDBACK_BINDING]: (gl: WebGL2RenderingContext, value) =>
-    (gl ).bindTransformFeedback?.(GL.TRANSFORM_FEEDBACK, value),
-  [GL.VERTEX_ARRAY_BINDING]: (gl: WebGL2RenderingContext, value) =>
-    (gl ).bindVertexArray(value),
+    gl.bindTransformFeedback?.(GL.TRANSFORM_FEEDBACK, value),
+  [GL.VERTEX_ARRAY_BINDING]: (gl: WebGL2RenderingContext, value) => gl.bindVertexArray(value),
   // NOTE: FRAMEBUFFER_BINDING and DRAW_FRAMEBUFFER_BINDING(WebGL2) refer same state.
   [GL.FRAMEBUFFER_BINDING]: bindFramebuffer,
   [GL.READ_FRAMEBUFFER_BINDING]: bindFramebuffer,
@@ -178,7 +178,8 @@ export const GL_PARAMETER_SETTERS = {
   [GL.SAMPLE_COVERAGE_VALUE]: 'sampleCoverage',
   [GL.SAMPLE_COVERAGE_INVERT]: 'sampleCoverage',
   [GL.SCISSOR_TEST]: enable,
-  [GL.SCISSOR_BOX]: (gl: WebGL2RenderingContext, value: [number, number, number, number]) => gl.scissor(...value),
+  [GL.SCISSOR_BOX]: (gl: WebGL2RenderingContext, value: [number, number, number, number]) =>
+    gl.scissor(...value),
   [GL.STENCIL_TEST]: enable,
   [GL.STENCIL_CLEAR_VALUE]: (gl: WebGL2RenderingContext, value) => gl.clearStencil(value),
   [GL.STENCIL_WRITEMASK]: (gl: WebGL2RenderingContext, value) =>
@@ -197,17 +198,41 @@ export const GL_PARAMETER_SETTERS = {
   [GL.STENCIL_BACK_FAIL]: 'stencilOpBack',
   [GL.STENCIL_BACK_PASS_DEPTH_FAIL]: 'stencilOpBack',
   [GL.STENCIL_BACK_PASS_DEPTH_PASS]: 'stencilOpBack',
-  [GL.VIEWPORT]: (gl: WebGL2RenderingContext, value: [number, number, number, number]) => gl.viewport(...value),
+  [GL.VIEWPORT]: (gl: WebGL2RenderingContext, value: [number, number, number, number]) =>
+    gl.viewport(...value),
+
+  // WEBGL2 EXTENSIONS
 
-  // WEBGL1 PIXEL PACK/UNPACK MODES
+  // EXT_depth_clamp https://registry.khronos.org/webgl/extensions/EXT_depth_clamp/
+
+  [GL.DEPTH_CLAMP_EXT]: enable,
+
+  // WEBGL_provoking_vertex https://registry.khronos.org/webgl/extensions/WEBGL_provoking_vertex/
+
+  // [GL.PROVOKING_VERTEX_WEBL]: TODO - extension function needed
+
+  // WEBGL_polygon_mode https://registry.khronos.org/webgl/extensions/WEBGL_polygon_mode/
+
+  // POLYGON_MODE_WEBGL  TODO - extension function needed
+  [GL.POLYGON_OFFSET_LINE_WEBGL]: enable,
+
+  // WEBGL_clip_cull_distance https://registry.khronos.org/webgl/extensions/WEBGL_clip_cull_distance/
+
+  [GL.CLIP_DISTANCE0_WEBGL]: enable,
+  [GL.CLIP_DISTANCE1_WEBGL]: enable,
+  [GL.CLIP_DISTANCE2_WEBGL]: enable,
+  [GL.CLIP_DISTANCE3_WEBGL]: enable,
+  [GL.CLIP_DISTANCE4_WEBGL]: enable,
+  [GL.CLIP_DISTANCE5_WEBGL]: enable,
+  [GL.CLIP_DISTANCE6_WEBGL]: enable,
+  [GL.CLIP_DISTANCE7_WEBGL]: enable,
+
+  // PIXEL PACK/UNPACK MODES
   [GL.PACK_ALIGNMENT]: pixelStorei,
   [GL.UNPACK_ALIGNMENT]: pixelStorei,
   [GL.UNPACK_FLIP_Y_WEBGL]: pixelStorei,
   [GL.UNPACK_PREMULTIPLY_ALPHA_WEBGL]: pixelStorei,
   [GL.UNPACK_COLORSPACE_CONVERSION_WEBGL]: pixelStorei,
-
-  // WEBGL2 PIXEL PACK/UNPACK MODES
-  // RASTERIZER_DISCARD ...
   [GL.PACK_ROW_LENGTH]: pixelStorei,
   [GL.PACK_SKIP_PIXELS]: pixelStorei,
   [GL.PACK_SKIP_ROWS]: pixelStorei,
@@ -224,22 +249,30 @@ export const GL_PARAMETER_SETTERS = {
     const handle = framebuffer && 'handle' in framebuffer ? framebuffer.handle : framebuffer;
     return gl.bindFramebuffer(GL.FRAMEBUFFER, handle);
   },
-  blend: (gl: WebGL2RenderingContext, value) => (value ? gl.enable(GL.BLEND) : gl.disable(GL.BLEND)),
-  blendColor: (gl: WebGL2RenderingContext, value: [number, number, number, number]) => gl.blendColor(...value),
+  blend: (gl: WebGL2RenderingContext, value) =>
+    value ? gl.enable(GL.BLEND) : gl.disable(GL.BLEND),
+  blendColor: (gl: WebGL2RenderingContext, value: [number, number, number, number]) =>
+    gl.blendColor(...value),
   blendEquation: (gl: WebGL2RenderingContext, args: number | [number, number]) => {
-    const separateModes = typeof args === 'number' ? [args, args] as [number, number]: args;
+    const separateModes = typeof args === 'number' ? ([args, args] as [number, number]) : args;
     gl.blendEquationSeparate(...separateModes);
   },
-  blendFunc: (gl: WebGL2RenderingContext, args: [number, number] | [number, number, number, number]) => {
-    const separateFuncs = args?.length === 2 ? [...args, ...args] as [number, number, number, number] : args;
+  blendFunc: (
+    gl: WebGL2RenderingContext,
+    args: [number, number] | [number, number, number, number]
+  ) => {
+    const separateFuncs =
+      args?.length === 2 ? ([...args, ...args] as [number, number, number, number]) : args;
     gl.blendFuncSeparate(...separateFuncs);
   },
 
-  clearColor: (gl: WebGL2RenderingContext, value: [number, number, number, number]) => gl.clearColor(...value),
+  clearColor: (gl: WebGL2RenderingContext, value: [number, number, number, number]) =>
+    gl.clearColor(...value),
   clearDepth: (gl: WebGL2RenderingContext, value) => gl.clearDepth(value),
   clearStencil: (gl: WebGL2RenderingContext, value) => gl.clearStencil(value),
 
-  colorMask: (gl: WebGL2RenderingContext, value: [boolean, boolean, boolean, boolean]) => gl.colorMask(...value),
+  colorMask: (gl: WebGL2RenderingContext, value: [boolean, boolean, boolean, boolean]) =>
+    gl.colorMask(...value),
 
   cull: (gl: WebGL2RenderingContext, value) =>
     value ? gl.enable(GL.CULL_FACE) : gl.disable(GL.CULL_FACE),
@@ -267,13 +300,16 @@ export const GL_PARAMETER_SETTERS = {
 
   polygonOffsetFill: (gl: WebGL2RenderingContext, value) =>
     value ? gl.enable(GL.POLYGON_OFFSET_FILL) : gl.disable(GL.POLYGON_OFFSET_FILL),
-  polygonOffset: (gl: WebGL2RenderingContext, value: [number, number]) => gl.polygonOffset(...value),
+  polygonOffset: (gl: WebGL2RenderingContext, value: [number, number]) =>
+    gl.polygonOffset(...value),
 
-  sampleCoverage: (gl: WebGL2RenderingContext, value: [number, boolean?]) => gl.sampleCoverage(...value),
+  sampleCoverage: (gl: WebGL2RenderingContext, value: [number, boolean?]) =>
+    gl.sampleCoverage(...value),
 
   scissorTest: (gl: WebGL2RenderingContext, value) =>
     value ? gl.enable(GL.SCISSOR_TEST) : gl.disable(GL.SCISSOR_TEST),
-  scissor: (gl: WebGL2RenderingContext, value: [number, number, number, number]) => gl.scissor(...value),
+  scissor: (gl: WebGL2RenderingContext, value: [number, number, number, number]) =>
+    gl.scissor(...value),
 
   stencilTest: (gl: WebGL2RenderingContext, value) =>
     value ? gl.enable(GL.STENCIL_TEST) : gl.disable(GL.STENCIL_TEST),
@@ -296,7 +332,8 @@ export const GL_PARAMETER_SETTERS = {
     gl.stencilOpSeparate(GL.BACK, backSfail, backDpfail, backDppass);
   },
 
-  viewport: (gl: WebGL2RenderingContext, value: [number, number, number, number]) => gl.viewport(...value)
+  viewport: (gl: WebGL2RenderingContext, value: [number, number, number, number]) =>
+    gl.viewport(...value)
 };
 
 function getValue(glEnum, values, cache) {

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

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 /** deeply compare two arrays */

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

@@ -1,10 +1,15 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 // Support for listening to context state changes and intercepting state queries
 // NOTE: this system does not handle buffer bindings
 import {assert} from '@luma.gl/core';
-import {GL_PARAMETER_DEFAULTS, GL_HOOKED_SETTERS, NON_CACHE_PARAMETERS} from '../parameters/webgl-parameter-tables';
+import {
+  GL_PARAMETER_DEFAULTS,
+  GL_HOOKED_SETTERS,
+  NON_CACHE_PARAMETERS
+} from '../parameters/webgl-parameter-tables';
 import {setGLParameters, getGLParameters} from '../parameters/unified-parameter-api';
 import {deepArrayEqual} from './deep-array-equal';
 
@@ -57,7 +62,8 @@ class GLState {
     let valueChanged = false;
     let oldValue; // = undefined
 
-    const oldValues: {[key: number | string]: any} | null = this.stateStack.length > 0 ? this.stateStack[this.stateStack.length - 1] : null;
+    const oldValues: {[key: number | string]: any} | null =
+      this.stateStack.length > 0 ? this.stateStack[this.stateStack.length - 1] : null;
 
     for (const key in values) {
       assert(key !== undefined);
@@ -152,7 +158,6 @@ export function pushContextState(gl: WebGL2RenderingContext): void {
   glState.push();
 }
 
-
 /**
  * Restores previously saved WebGL context state
  */
@@ -190,9 +195,9 @@ function installGetterOverride(gl: WebGL2RenderingContext, functionName: string)
     // Optionally call the original function to do a "hard" query from the WebGL2RenderingContext
     return glState.enable
       ? // Call the getter the params so that it can e.g. serve from a cache
-      glState.cache[pname]
+        glState.cache[pname]
       : // Optionally call the original function to do a "hard" query from the WebGL2RenderingContext
-      originalGetterFunc(pname);
+        originalGetterFunc(pname);
   };
 
   // Set the name of this anonymous function to help in debugging and profiling

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

@@ -1,8 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {Device} from '@luma.gl/core';
-import {WebGLDevice} from '../../adapter/webgl-device';
 import {GLParameters, setGLParameters} from '../parameters/unified-parameter-api';
 import {pushContextState, popContextState} from './track-context-state';
 
@@ -14,13 +13,14 @@ import {pushContextState, popContextState} from './track-context-state';
  * - Restores parameters
  * - Returns the return value of the supplied function
  */
-export function withGLParameters(device: Device | WebGL2RenderingContext, parameters: GLParameters & {nocatch?: boolean}, func: any): any {
-  const webglDevice = WebGLDevice.attach(device);
-  const gl = webglDevice.gl;
-
+export function withGLParameters(
+  gl: WebGL2RenderingContext,
+  parameters: GLParameters & {nocatch?: boolean},
+  func: any
+): any {
   if (isObjectEmpty(parameters)) {
     // Avoid setting state if no parameters provided. Just call and return
-    return func(device);
+    return func(gl);
   }
 
   const {nocatch = true} = parameters;

package/src/index.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 // luma.gl Base WebGL wrapper library
@@ -8,7 +9,7 @@
 // Higher level abstractions can be built on these classes
 
 // Types
-export type {WebGLLimits} from './adapter/device-helpers/webgl-device-limits';
+export type {WebGLDeviceLimits} from './adapter/device-helpers/webgl-device-limits';
 
 // WebGL adapter classes
 export {WebGLDevice} from './adapter/webgl-device';
@@ -30,10 +31,6 @@ export {WEBGLRenderPass} from './adapter/resources/webgl-render-pass';
 // export {WEBGLComputePass} from './adapter/resources/webgl-compute-pass';
 export {WEBGLVertexArray} from './adapter/resources/webgl-vertex-array';
 
-// Internal WebGL classes
-export type {RenderbufferProps} from './adapter/objects/webgl-renderbuffer';
-export {WEBGLRenderbuffer} from './adapter/objects/webgl-renderbuffer';
-
 // WebGL adapter classes
 export {WEBGLTransformFeedback} from './adapter/resources/webgl-transform-feedback';
 
@@ -49,6 +46,10 @@ export {setDeviceParameters, withDeviceParameters} from './adapter/converters/de
 export {getShaderLayout} from './adapter/helpers/get-shader-layout';
 export {convertGLToTextureFormat} from './adapter/converters/texture-formats';
 
+// Internal WebGL classes
+export type {RenderbufferProps as _RenderbufferProps} from './adapter/objects/webgl-renderbuffer';
+export {WEBGLRenderbuffer as _WEBGLRenderbuffer} from './adapter/objects/webgl-renderbuffer';
+
 // TEST EXPORTS
 export {TEXTURE_FORMATS as _TEXTURE_FORMATS} from './adapter/converters/texture-formats';
 

package/src/types.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 export type AccessorObject = {

package/dist/adapter/device-helpers/device-features.d.ts

@@ -1,6 +0,0 @@
-import { DeviceFeature } from '@luma.gl/core';
-/** Get WebGPU style feature strings */
-export declare function getDeviceFeatures(gl: WebGL2RenderingContext): Set<DeviceFeature>;
-/** Extract all WebGL features */
-export declare function getWebGLFeatures(gl: WebGL2RenderingContext): Set<DeviceFeature>;
-//# sourceMappingURL=device-features.d.ts.map

package/dist/adapter/device-helpers/device-features.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"device-features.d.ts","sourceRoot":"","sources":["../../../src/adapter/device-helpers/device-features.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAG5C,uCAAuC;AACvC,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,sBAAsB,GAAG,GAAG,CAAC,aAAa,CAAC,CAiBhF;AAED,iCAAiC;AACjC,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,sBAAsB,GAAG,GAAG,CAAC,aAAa,CAAC,CAe/E"}

package/dist/adapter/device-helpers/device-features.js

@@ -1,65 +0,0 @@
-// luma.gl, MIT license
-// Copyright (c) vis.gl contributors
-import { getTextureFeatures } from '../converters/texture-formats';
-/** Get WebGPU style feature strings */
-export function getDeviceFeatures(gl) {
-    const features = getWebGLFeatures(gl);
-    // texture features
-    // features.add('texture-compression-bc'); 
-    for (const textureFeature of getTextureFeatures(gl)) {
-        features.add(textureFeature);
-    }
-    // TODO
-    // features.add('depth-clip-control'); // GPUPrimitiveState.clampDepth
-    // features.add('depth24unorm-stencil8'); // GPUTextureFormat 'depth24unorm-stencil8'.
-    // features.add('depth32float-stencil8'); // GPUTextureFormat 'depth32float-stencil8'.
-    // features.add('timestamp-query'); // GPUQueryType "timestamp-query"
-    // "indirect-first-instance"
-    return features;
-}
-/** Extract all WebGL features */
-export function getWebGLFeatures(gl) {
-    // Enables EXT_float_blend first: https://developer.mozilla.org/en-US/docs/Web/API/EXT_float_blend
-    gl.getExtension('EXT_color_buffer_float');
-    gl.getExtension('WEBGL_color_buffer_float');
-    gl.getExtension('EXT_float_blend');
-    const features = new Set(WEBGL_ALWAYS_FEATURES);
-    for (const feature of Object.keys(WEBGL_FEATURES)) {
-        // @ts-expect-error
-        if (isFeatureSupported(gl, feature)) {
-            // @ts-expect-error
-            features.add(feature);
-        }
-    }
-    return features;
-}
-function isFeatureSupported(gl, feature) {
-    const featureInfo = WEBGL_FEATURES[feature];
-    if (!featureInfo) {
-        return false;
-    }
-    // Get extension name from table
-    const featureDefinition = featureInfo;
-    // Check if the value is dependent on checking one or more extensions
-    if (typeof featureDefinition === 'boolean') {
-        return featureDefinition;
-    }
-    return Boolean(gl.getExtension(featureDefinition));
-}
-const WEBGL_ALWAYS_FEATURES = ['webgl', 'glsl', 'transform-feedback-webgl'];
-/**
- * Defines luma.gl "feature" names and semantics
- * when value is 'string' it is the name of the extension that enables this feature
- */
-const WEBGL_FEATURES = {
-    'timer-query-webgl': 'EXT_disjoint_timer_query_webgl2',
-    'transform-feedback-webgl': true,
-    // WEBGL1 SUPPORT
-    'texture-blend-float-webgl': 'EXT_float_blend',
-    'float32-filterable-linear-webgl': 'OES_texture_float_linear',
-    'float16-filterable-linear-webgl': 'OES_texture_half_float_linear',
-    'texture-filterable-anisotropic-webgl': 'EXT_texture_filter_anisotropic',
-    // FRAMEBUFFERS, TEXTURES AND RENDERBUFFERS
-    'float32-renderable-webgl': 'EXT_color_buffer_float',
-    'float16-renderable-webgl': 'EXT_color_buffer_half_float',
-};