@luma.gl/webgl 9.0.0-alpha.42 → 9.0.0-alpha.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/webgl",
-  "version": "9.0.0-alpha.42",
+  "version": "9.0.0-alpha.44",
   "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.42",
-    "@luma.gl/core": "9.0.0-alpha.42",
+    "@luma.gl/constants": "9.0.0-alpha.44",
+    "@luma.gl/core": "9.0.0-alpha.44",
     "@probe.gl/env": "^4.0.2"
   },
   "devDependencies": {
-    "@luma.gl/test-utils": "9.0.0-alpha.42"
+    "@luma.gl/test-utils": "9.0.0-alpha.44"
   },
-  "gitHead": "61f38eaaa9cc42fa08d1c00690e370fa85681e30"
+  "gitHead": "195bed39c8587a68686cf28c0ae0e8dbd9c963f5"
 }

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

@@ -6,6 +6,7 @@ import {WebGLDevice} from '../webgl-device';
 import {GL, GLParameters} from '@luma.gl/constants';
 import {withGLParameters} from '../../context/state-tracker/with-parameters';
 import {setGLParameters} from '../../context/parameters/unified-parameter-api';
+import {pushContextState, popContextState} from '../../context/state-tracker/track-context-state';
 
 // Should collapse during minification
 const GL_DEPTH_BUFFER_BIT = 0x00000100;
@@ -25,6 +26,7 @@ export class WEBGLRenderPass extends RenderPass {
     this.device = device;
 
     // TODO - do parameters (scissorRect) affect the clear operation?
+    pushContextState(this.device.gl);
     this.setParameters(this.props.parameters);
 
     // Hack - for now WebGL draws in "immediate mode" (instead of queueing the operations)...
@@ -32,6 +34,10 @@ export class WEBGLRenderPass extends RenderPass {
   }
 
   end(): void {
+    popContextState(this.device.gl);
+    if (this.props.framebuffer) {
+      setGLParameters(this.device, {framebuffer: null});
+    }
     // should add commands to CommandEncoder.
   }
 

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

@@ -4,7 +4,7 @@
 import type {UniformValue, RenderPipelineProps, Binding} from '@luma.gl/core';
 import type {ShaderLayout, PrimitiveTopology} from '@luma.gl/core';
 import type {RenderPass, VertexArray} from '@luma.gl/core';
-import {RenderPipeline, cast, log} from '@luma.gl/core';
+import {RenderPipeline, cast, splitUniformsAndBindings, log} from '@luma.gl/core';
 import {mergeShaderLayout} from '@luma.gl/core';
 // import {mergeShaderLayout, getAttributeInfosFromLayouts} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
@@ -44,8 +44,6 @@ export class WEBGLRenderPipeline extends RenderPipeline {
   /** WebGL varyings */
   varyings: string[] | null = null;
 
-  _textureUniforms: Record<string, any> = {};
-  _textureIndexCounter: number = 0;
   _uniformCount: number = 0;
   _uniformSetters: Record<string, Function> = {}; // TODO are these used?
 
@@ -131,7 +129,14 @@ export class WEBGLRenderPipeline extends RenderPipeline {
     // }
 
     for (const [name, value] of Object.entries(bindings)) {
-      const binding = this.shaderLayout.bindings.find(binding => binding.name === name);
+      // Accept both `xyz` and `xyzUniforms` as valid names for `xyzUniforms` uniform block
+      // This convention allows shaders to name uniform blocks as `uniform appUniforms {} app;`
+      // and reference them as `app` from both GLSL and JS.
+      // TODO - this is rather hacky - we could also remap the name directly in the shader layout.
+      const binding = 
+        this.shaderLayout.bindings.find(binding => binding.name === name) ||
+        this.shaderLayout.bindings.find(binding => binding.name === `${name}Uniforms`);
+
       if (!binding) {
         const validBindings = this.shaderLayout.bindings
           .map(binding => `"${binding.name}"`)
@@ -168,6 +173,12 @@ export class WEBGLRenderPipeline extends RenderPipeline {
   }
 
   setUniforms(uniforms: Record<string, UniformValue>) {
+    const {bindings} = splitUniformsAndBindings(uniforms);
+    Object.keys(bindings).forEach(name => {
+      log.warn(
+        `Unsupported value "${bindings[name]}" used in setUniforms() for key ${name}. Use setBindings() instead?`
+      )();
+    });
     // TODO - check against layout
     Object.assign(this.uniforms, uniforms);
   }
@@ -335,16 +346,9 @@ export class WEBGLRenderPipeline extends RenderPipeline {
   _areTexturesRenderable() {
     let texturesRenderable = true;
 
-    for (const [, texture] of Object.entries(this._textureUniforms)) {
-      texture.update();
-      texturesRenderable = texturesRenderable && texture.loaded;
-    }
-
     for (const [, texture] of Object.entries(this.bindings)) {
-      // texture.update();
-      // @ts-expect-error
-      if (texture.loaded !== undefined) {
-        // @ts-expect-error
+      if (texture instanceof WEBGLTexture) {
+        texture.update();
         texturesRenderable = texturesRenderable && texture.loaded;
       }
     }
@@ -386,7 +390,8 @@ export class WEBGLRenderPipeline extends RenderPipeline {
     let textureUnit = 0;
     let uniformBufferIndex = 0;
     for (const binding of this.shaderLayout.bindings) {
-      const value = this.bindings[binding.name];
+      // Accept both `xyz` and `xyzUniforms` as valid names for `xyzUniforms` uniform block
+      const value = this.bindings[binding.name] || this.bindings[binding.name.replace(/Uniforms$/, '')];
       if (!value) {
         throw new Error(`No value for binding ${binding.name} in ${this.id}`);
       }