@luma.gl/webgl 9.0.0-alpha.31 → 9.0.0-alpha.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/webgl",
-  "version": "9.0.0-alpha.31",
+  "version": "9.0.0-alpha.32",
   "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.31",
-    "@luma.gl/core": "9.0.0-alpha.31",
+    "@luma.gl/constants": "9.0.0-alpha.32",
+    "@luma.gl/core": "9.0.0-alpha.32",
     "@probe.gl/env": "^4.0.2"
   },
   "devDependencies": {
-    "@luma.gl/test-utils": "9.0.0-alpha.31"
+    "@luma.gl/test-utils": "9.0.0-alpha.32"
   },
-  "gitHead": "9f22c8a7f5a03abb1bea5530b77c083b8f553569"
+  "gitHead": "08b30dcae4aee321738cf05b509cef6b3b24c880"
 }

package/src/adapter/helpers/set-uniform.ts

@@ -1,53 +1,53 @@
 /* eslint-disable */
 
 // Uniforms
-import {GL} from '@luma.gl/constants';
+import type {UniformValue} from '@luma.gl/core';
+import {GL, GLCompositeType, GLSamplerType} from '@luma.gl/constants';
 
 /** Set a raw uniform (without type conversion and caching) */
 /* eslint-disable max-len */
 export function setUniform(
   gl: WebGLRenderingContext,
   location: WebGLUniformLocation,
-  type: GL,
-  value: number | Float32Array | Int32Array | Uint32Array | boolean
+  type: GLCompositeType | GLSamplerType,
+  value: UniformValue
 ): void {
   const gl2 = gl as WebGL2RenderingContext;
 
-  if (typeof value === 'number') {
-    // prettier-ignore
-    switch (type) {
-      // WebGL1 samplers
-      case GL.SAMPLER_2D:
-      case GL.SAMPLER_CUBE:
-      // WebGL2 samplers
-      case GL.SAMPLER_3D:
-      case GL.SAMPLER_2D_SHADOW:
-      case GL.SAMPLER_2D_ARRAY:
-      case GL.SAMPLER_2D_ARRAY_SHADOW:
-      case GL.SAMPLER_CUBE_SHADOW:
-      case GL.INT_SAMPLER_2D:
-      case GL.INT_SAMPLER_3D:
-      case GL.INT_SAMPLER_CUBE:
-      case GL.INT_SAMPLER_2D_ARRAY:
-      case GL.UNSIGNED_INT_SAMPLER_2D:
-      case GL.UNSIGNED_INT_SAMPLER_3D:
-      case GL.UNSIGNED_INT_SAMPLER_CUBE:
-      case GL.UNSIGNED_INT_SAMPLER_2D_ARRAY:
-        return gl.uniform1i(location, value);
-    }
+  // Prepare the value for WebGL setters
+  let uniformValue = value;
+  if (uniformValue === true) {
+    uniformValue = 1;
   }
-
-  if (value === true) {
-    value = 1;
-  }
-
-  if (value === false) {
-    value = 0;
+  if (uniformValue === false) {
+    uniformValue = 0;
   }
-  const arrayValue = (typeof value === 'number') ? [value] : value;
+  const arrayValue = typeof uniformValue === 'number' ? [uniformValue] : uniformValue;
 
   // prettier-ignore
   switch (type) {
+    // WebGL1 samplers
+    case GL.SAMPLER_2D:
+    case GL.SAMPLER_CUBE:
+    // WebGL2 samplers
+    case GL.SAMPLER_3D:
+    case GL.SAMPLER_2D_SHADOW:
+    case GL.SAMPLER_2D_ARRAY:
+    case GL.SAMPLER_2D_ARRAY_SHADOW:
+    case GL.SAMPLER_CUBE_SHADOW:
+    case GL.INT_SAMPLER_2D:
+    case GL.INT_SAMPLER_3D:
+    case GL.INT_SAMPLER_CUBE:
+    case GL.INT_SAMPLER_2D_ARRAY:
+    case GL.UNSIGNED_INT_SAMPLER_2D:
+    case GL.UNSIGNED_INT_SAMPLER_3D:
+    case GL.UNSIGNED_INT_SAMPLER_CUBE:
+    case GL.UNSIGNED_INT_SAMPLER_2D_ARRAY:
+      if (typeof value !== 'number') {
+        throw new Error('samplers must be set to integers');
+      }
+      return gl.uniform1i(location, value);
+
     case GL.FLOAT: return gl.uniform1fv(location, arrayValue);
     case GL.FLOAT_VEC2: return gl.uniform2fv(location, arrayValue);
     case GL.FLOAT_VEC3: return gl.uniform3fv(location, arrayValue);

package/src/adapter/resources/webgl-render-pipeline.ts

@@ -1,18 +1,16 @@
+// luma.gl, MIT license
 import type {
+  TypedArray,
+  UniformValue,
   RenderPipelineProps,
-  RenderPass,
-  Buffer,
   Binding,
   ShaderLayout,
-  PrimitiveTopology,
-  TypedArray,
-  BufferLayout
+  BufferLayout,
+  PrimitiveTopology
 } from '@luma.gl/core';
+import type {RenderPass, Buffer} from '@luma.gl/core';
 import {RenderPipeline, cast, log} from '@luma.gl/core';
-import {
-  mergeShaderLayout,
-  getAttributeInfosFromLayouts
-} from '@luma.gl/core';
+import {mergeShaderLayout, getAttributeInfosFromLayouts} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 
 import {getGLFromVertexType} from '../converters/vertex-formats';
@@ -112,7 +110,6 @@ export class WEBGLRenderPipeline extends RenderPipeline {
     this._indexBuffer = webglBuffer;
   }
 
-
   /** @todo needed for portable model */
   setAttributes(buffers: Record<string, Buffer>): void {
     const attributeInfos = getAttributeInfosFromLayouts(this.shaderLayout, this.bufferLayout);
@@ -159,8 +156,10 @@ export class WEBGLRenderPipeline extends RenderPipeline {
         });
         set = true;
       }
-      if (!set)  {
-        log.warn(`setAttributes(): Ignoring (buffer "${buffer.id}" for unknown attribute "${name}" in pipeline "${this.id}"`)();
+      if (!set) {
+        log.warn(
+          `setAttributes(): Ignoring (buffer "${buffer.id}" for unknown attribute "${name}" in pipeline "${this.id}"`
+        )();
       }
     }
   }
@@ -227,7 +226,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
     }
   }
 
-  setUniforms(uniforms: Record<string, any>) {
+  setUniforms(uniforms: Record<string, UniformValue>) {
     // TODO - check against layout
     Object.assign(this.uniforms, uniforms);
   }

package/src/classic/buffer-with-accessor.ts

@@ -81,7 +81,6 @@ export type BufferWithAccessorProps = BufferProps & {
 
 /** WebGL Buffer interface */
 export class BufferWithAccessor extends WEBGLBuffer {
-  usage: number;
   accessor: Accessor;
 
   constructor(device: Device | WebGLRenderingContext, props?: BufferWithAccessorProps);