@luma.gl/webgl 9.0.0-alpha.46 → 9.0.0-alpha.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/webgl",
-  "version": "9.0.0-alpha.46",
+  "version": "9.0.0-alpha.47",
   "description": "WebGL2 adapter for the luma.gl API",
   "type": "module",
   "license": "MIT",
@@ -44,12 +44,12 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@luma.gl/constants": "9.0.0-alpha.46",
-    "@luma.gl/core": "9.0.0-alpha.46",
+    "@luma.gl/constants": "9.0.0-alpha.47",
+    "@luma.gl/core": "9.0.0-alpha.47",
     "@probe.gl/env": "^4.0.2"
   },
   "devDependencies": {
-    "@luma.gl/test-utils": "9.0.0-alpha.46"
+    "@luma.gl/test-utils": "9.0.0-alpha.47"
   },
-  "gitHead": "c1e0602fd739f8d08e6532034a02e8cf658e188a"
+  "gitHead": "7c6e28518021f98c7d0739f5cbdac386144206a1"
 }

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

@@ -1,17 +1,10 @@
 import type {PrimitiveTopology, ShaderLayout, TransformFeedbackProps} from '@luma.gl/core';
-import {log, TransformFeedback, Buffer} from '@luma.gl/core';
+import {log, TransformFeedback, Buffer, BufferRange} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {WebGLDevice} from '../webgl-device';
 import {WEBGLBuffer} from '../..';
 import {getGLPrimitive} from '../helpers/webgl-topology-utils';
 
-/** For bindRange */
-type BufferRange = {
-  buffer: Buffer;
-  byteOffset?: number;
-  byteLength?: number;
-};
-
 export class WEBGLTransformFeedback extends TransformFeedback {
   readonly device: WebGLDevice;
   readonly gl2: WebGL2RenderingContext;
@@ -72,7 +65,7 @@ export class WEBGLTransformFeedback extends TransformFeedback {
 
   // SUBCLASS
 
-  setBuffers(buffers: Record<string, Buffer | BufferRange>) {
+  setBuffers(buffers: Record<string, Buffer | BufferRange>): void {
     this.buffers = {};
     this.unusedBuffers = {};
 
@@ -81,17 +74,16 @@ export class WEBGLTransformFeedback extends TransformFeedback {
         this.setBuffer(bufferName, buffers[bufferName]);
       }
     });
-    return this;
   }
 
-  setBuffer(locationOrName: string | number, bufferOrRange: Buffer | BufferRange) {
+  setBuffer(locationOrName: string | number, bufferOrRange: Buffer | BufferRange): void {
     const location = this._getVaryingIndex(locationOrName);
     const {buffer, byteLength, byteOffset} = this._getBufferRange(bufferOrRange);
 
     if (location < 0) {
       this.unusedBuffers[locationOrName] = buffer;
       log.warn(`${this.id} unusedBuffers varying buffer ${locationOrName}`)();
-      return this;
+      return;
     }
 
     this.buffers[location] = {buffer, byteLength, byteOffset};
@@ -101,8 +93,14 @@ export class WEBGLTransformFeedback extends TransformFeedback {
     if (!this.bindOnUse) {
       this._bindBuffer(location, buffer, byteOffset, byteLength);
     }
+  }
 
-    return this;
+  getBuffer(locationOrName: string | number): Buffer | BufferRange | null {
+    if (isIndex(locationOrName)) {
+      return this.buffers[locationOrName] || null;
+    }
+    const location = this._getVaryingIndex(locationOrName);
+    return location >= 0 ? this.buffers[location] : null;
   }
 
   bind(funcOrHandle = this.handle) {
@@ -146,7 +144,7 @@ export class WEBGLTransformFeedback extends TransformFeedback {
     return {buffer, byteOffset, byteLength};
   }
 
-  protected _getVaryingIndex(locationOrName: string | number) {
+  protected _getVaryingIndex(locationOrName: string | number): number {
     if (isIndex(locationOrName)) {
       return Number(locationOrName);
     }
@@ -182,14 +180,13 @@ export class WEBGLTransformFeedback extends TransformFeedback {
     buffer: Buffer,
     byteOffset = 0,
     byteLength?: number
-  ): this {
+  ): void {
     const handle = buffer && (buffer as WEBGLBuffer).handle;
     if (!handle || byteLength === undefined) {
       this.gl2.bindBufferBase(GL.TRANSFORM_FEEDBACK_BUFFER, index, handle);
     } else {
       this.gl2.bindBufferRange(GL.TRANSFORM_FEEDBACK_BUFFER, index, handle, byteOffset, byteLength);
     }
-    return this;
   }
 }
 

package/src/classic/typed-array-utils.ts

@@ -9,6 +9,7 @@ const ERR_TYPE_DEDUCTION = 'Failed to deduce GL constant from typed array';
 /**
  * Converts TYPED ARRAYS to corresponding GL constant
  * Used to auto deduce gl parameter types
+ * @deprecated Use getDataTypeFromTypedArray
  * @param arrayOrType
  * @returns
  */
@@ -40,6 +41,7 @@ export function getGLTypeFromTypedArray(arrayOrType: TypedArray): GLDataType {
 /**
  * Converts GL constant to corresponding TYPED ARRAY
  * Used to auto deduce gl parameter types
+ * @deprecated Use getTypedArrayFromDataType
  * @param glType
  * @param param1
  * @returns