@luma.gl/webgl 9.0.0-alpha.4 → 9.0.0-alpha.6

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

@@ -10,14 +10,14 @@ import {deepArrayEqual} from './deep-array-equal';
 /* eslint-disable no-shadow */
 class GLState {
   gl: WebGLRenderingContext;
-  program = null;
-  stateStack = [];
+  program: unknown = null;
+  stateStack: object[] = [];
   enable = true;
-  cache;
+  cache: Record<string, any>;
   log;
 
   constructor(
-    gl,
+    gl: WebGLRenderingContext,
     {
       copyState = false, // Copy cache from params (slow) or initialize from WebGL defaults (fast)
       log = () => {} // Logging function, called when gl parameter change calls are actually issued
@@ -50,11 +50,11 @@ class GLState {
    * @param values
    * @returns
    */
-  _updateCache(values) {
+  _updateCache(values: {[key: number | string]: any}) {
     let valueChanged = false;
     let oldValue; // = undefined
 
-    const oldValues = this.stateStack.length > 0 && this.stateStack[this.stateStack.length - 1];
+    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);
@@ -209,12 +209,13 @@ function installGetterOverride(gl: WebGLRenderingContext, functionName: string)
  * @param setter
  * @returns
  */
-function installSetterSpy(gl: WebGLRenderingContext, functionName, setter) {
+function installSetterSpy(gl: WebGLRenderingContext, functionName: string, setter) {
   // Get the original function from the WebGLRenderingContext
   if (!gl[functionName]) {
     // This could happen if we try to intercept WebGL2 method on a WebGL1 context
     return;
   }
+
   const originalSetterFunc = gl[functionName].bind(gl);
 
   // Wrap it with a spy so that we can update our state cache when it gets called

package/src/index.ts

@@ -8,13 +8,14 @@
 import '@luma.gl/api';
 import './init'
 
+// Types
+export type {WebGLLimits} from './adapter/device-helpers/device-limits';
+
+// WebGL adapter classes
 export {default as WebGLDevice} from './adapter/webgl-device';
 export {default as WebGLCanvasContext} from './adapter/webgl-canvas-context';
 
-// Legacy WebGL Classes - will be moved to gltools
-export {default as Accessor} from './classic/accessor';
-export type {ClassicBufferProps as BufferProps} from './classic/buffer';
-export {default as Buffer} from './classic/buffer';
+// WebGL Resource classes
 export {default as WEBGLResource, default as WebGLResource} from './adapter/objects/webgl-resource';
 export {default as WEBGLBuffer} from './adapter/resources/webgl-buffer';
 export {default as WEBGLTexture} from './adapter/resources/webgl-texture';
@@ -24,16 +25,21 @@ export {default as WEBGLSampler} from './adapter/resources/webgl-sampler';
 export {default as WEBGLFramebuffer} from './adapter/resources/webgl-framebuffer';
 
 export {default as WEBGLRenderPipeline} from './adapter/resources/webgl-render-pipeline';
-
 // export {default as WEBGLComputePipeline} from './adapter/resources/webgl-compute-pipeline';
 export {default as WEBGLCommandEncoder} from './adapter/resources/webgl-command-encoder';
 export {default as WEBGLRenderPass} from './adapter/resources/webgl-render-pass';
 //export {default as WEBGLComputePass} from './adapter/resources/webgl-compute-pass';
 
+// non-api resources
 export type {RenderbufferProps} from './adapter/objects/webgl-renderbuffer';
 export {default as WEBGLRenderbuffer} from './adapter/objects/webgl-renderbuffer';
 export {default as WEBGLVertexArrayObject} from './adapter/objects/webgl-vertex-array-object';
 
+// WebGL adapter classes (Legacy, will be moved to gltools)
+export {default as Accessor} from './classic/accessor';
+export type {ClassicBufferProps, ClassicBufferProps as BufferProps} from './classic/buffer';
+export {default as ClassicBuffer, default as Buffer} from './classic/buffer';
+
 export {
   isWebGL,
   isWebGL2,

package/src/types/webgl.ts

@@ -120,7 +120,7 @@ export type GLStencilOp =
   | GL.INVERT;
 
 /** Parameters for textures and samplers */
-export type WebGLSamplerParameters = {
+export type GLSamplerParameters = {
   [GL.TEXTURE_WRAP_S]?: GL.CLAMP_TO_EDGE | GL.REPEAT | GL.MIRRORED_REPEAT;
   [GL.TEXTURE_WRAP_T]?: GL.CLAMP_TO_EDGE | GL.REPEAT | GL.MIRRORED_REPEAT;
   [GL.TEXTURE_WRAP_R]?: GL.CLAMP_TO_EDGE | GL.REPEAT | GL.MIRRORED_REPEAT;
@@ -135,6 +135,7 @@ export type WebGLSamplerParameters = {
   [GL.TEXTURE_MIN_LOD]?: number;
   [GL.TEXTURE_MAX_LOD]?: number;
   [GL.TEXTURE_COMPARE_FUNC]?: number; // COMPARE_FUNC);
+  [GL.TEXTURE_COMPARE_MODE]?: GL.COMPARE_REF_TO_TEXTURE;
   [GL.TEXTURE_MAX_ANISOTROPY_EXT]?: number; //
 };
 
@@ -280,4 +281,4 @@ export type GLFunctionParameters = {
 };
 
 /** WebGL style parameters object (with both GL constants and function style fields) */
-export type GLParameters = GLValueParameters | GLFunctionParameters;
+export type GLParameters = GLValueParameters & GLFunctionParameters;