webgl2 1.3.1 → 1.3.3

package/coverage.md

@@ -4,52 +4,53 @@
 
 | File | Lines Covered | Lines Missed | Total Lines | Coverage |
 |---|---|---|---|---:|
-| src/coverage.rs | 9 | 5 | 14 | 64.29% 🟡 |
-| src/decompiler/ast.rs | 6 | 0 | 6 | 100.00% 🟢 |
-| src/decompiler/emitter.rs | 24 | 3 | 27 | 88.89% 🟢 |
+| src/coverage.rs | 14 | 5 | 19 | 73.68% 🟡 |
+| src/decompiler/ast.rs | 2 | 4 | 6 | 33.33% 🟡 |
+| src/decompiler/emitter.rs | 27 | 4 | 31 | 87.10% 🟢 |
 | src/decompiler/lifter.rs | 6 | 2 | 8 | 75.00% 🟡 |
-| src/decompiler/parser.rs | 12 | 3 | 15 | 80.00% 🟢 |
-| src/decompiler/simplifier.rs | 36 | 2 | 38 | 94.74% 🟢 |
-| src/error.rs | 33 | 8 | 41 | 80.49% 🟢 |
-| src/lib.rs | 155 | 298 | 453 | 34.22% 🟠 |
-| src/naga_wasm_backend/backend.rs | 151 | 24 | 175 | 86.29% 🟢 |
+| src/decompiler/mod.rs | 1 | 0 | 1 | 100.00% 🟢 |
+| src/decompiler/parser.rs | 3 | 2 | 5 | 60.00% 🟡 |
+| src/decompiler/simplifier.rs | 35 | 2 | 37 | 94.59% 🟢 |
+| src/error.rs | 31 | 6 | 37 | 83.78% 🟢 |
+| src/lib.rs | 151 | 331 | 482 | 31.33% 🟠 |
+| src/naga_wasm_backend/backend.rs | 153 | 30 | 183 | 83.61% 🟢 |
 | src/naga_wasm_backend/call_lowering.rs | 9 | 3 | 12 | 75.00% 🟡 |
-| src/naga_wasm_backend/control_flow.rs | 38 | 30 | 68 | 55.88% 🟡 |
-| src/naga_wasm_backend/debug/stub.rs | 11 | 16 | 27 | 40.74% 🟠 |
-| src/naga_wasm_backend/expressions.rs | 270 | 155 | 425 | 63.53% 🟡 |
-| src/naga_wasm_backend/function_abi.rs | 15 | 8 | 23 | 65.22% 🟡 |
-| src/naga_wasm_backend/functions/prep.rs | 5 | 0 | 5 | 100.00% 🟢 |
-| src/naga_wasm_backend/functions/registry.rs | 6 | 0 | 6 | 100.00% 🟢 |
-| src/naga_wasm_backend/memory_layout.rs | 15 | 1 | 16 | 93.75% 🟢 |
-| src/naga_wasm_backend/mod.rs | 6 | 0 | 6 | 100.00% 🟢 |
-| src/naga_wasm_backend/output_layout.rs | 7 | 1 | 8 | 87.50% 🟢 |
-| src/naga_wasm_backend/types.rs | 22 | 6 | 28 | 78.57% 🟡 |
-| src/wasm_gl_emu/device.rs | 3 | 0 | 3 | 100.00% 🟢 |
-| src/wasm_gl_emu/framebuffer.rs | 1 | 0 | 1 | 100.00% 🟢 |
-| src/wasm_gl_emu/rasterizer.rs | 16 | 41 | 57 | 28.07% 🟠 |
-| src/wasm_gl_emu/transfer.rs | 3 | 0 | 3 | 100.00% 🟢 |
-| src/webgl2_context/blend.rs | 14 | 1 | 15 | 93.33% 🟢 |
-| src/webgl2_context/buffers.rs | 12 | 0 | 12 | 100.00% 🟢 |
-| src/webgl2_context/drawing.rs | 33 | 0 | 33 | 100.00% 🟢 |
-| src/webgl2_context/ephemeral.rs | 0 | 1 | 1 | 0.00% 🟡 |
-| src/webgl2_context/framebuffers.rs | 8 | 6 | 14 | 57.14% 🟡 |
-| src/webgl2_context/registry.rs | 11 | 0 | 11 | 100.00% 🟢 |
-| src/webgl2_context/shaders.rs | 137 | 29 | 166 | 82.53% 🟢 |
-| src/webgl2_context/state.rs | 33 | 9 | 42 | 78.57% 🟡 |
-| src/webgl2_context/textures.rs | 60 | 0 | 60 | 100.00% 🟢 |
-| src/webgl2_context/types.rs | 45 | 21 | 66 | 68.18% 🟡 |
-| src/webgpu/adapter.rs | 3 | 0 | 3 | 100.00% 🟢 |
-| src/webgpu/backend.rs | 52 | 17 | 69 | 75.36% 🟡 |
-| src/webgpu/bind_group.rs | 6 | 1 | 7 | 85.71% 🟢 |
-| src/webgpu/buffer.rs | 8 | 2 | 10 | 80.00% 🟢 |
-| src/webgpu/command.rs | 12 | 5 | 17 | 70.59% 🟡 |
-| **Total** | **1293** | **698** | **1991** | **64.94% 🟡** |
+| src/naga_wasm_backend/control_flow.rs | 41 | 27 | 68 | 60.29% 🟡 |
+| src/naga_wasm_backend/debug/stub.rs | 11 | 13 | 24 | 45.83% 🟠 |
+| src/naga_wasm_backend/expressions.rs | 270 | 147 | 417 | 64.75% 🟡 |
+| src/naga_wasm_backend/function_abi.rs | 19 | 5 | 24 | 79.17% 🟡 |
+| src/naga_wasm_backend/functions/prep.rs | 4 | 0 | 4 | 100.00% 🟢 |
+| src/naga_wasm_backend/functions/registry.rs | 5 | 0 | 5 | 100.00% 🟢 |
+| src/naga_wasm_backend/memory_layout.rs | 12 | 0 | 12 | 100.00% 🟢 |
+| src/naga_wasm_backend/mod.rs | 7 | 0 | 7 | 100.00% 🟢 |
+| src/naga_wasm_backend/output_layout.rs | 5 | 0 | 5 | 100.00% 🟢 |
+| src/naga_wasm_backend/types.rs | 23 | 6 | 29 | 79.31% 🟡 |
+| src/wasm_gl_emu/device.rs | 4 | 1 | 5 | 80.00% 🟢 |
+| src/wasm_gl_emu/framebuffer.rs | 2 | 0 | 2 | 100.00% 🟢 |
+| src/wasm_gl_emu/rasterizer.rs | 19 | 42 | 61 | 31.15% 🟠 |
+| src/wasm_gl_emu/transfer.rs | 0 | 3 | 3 | 0.00% 🟡 |
+| src/webgl2_context/buffers.rs | 14 | 0 | 14 | 100.00% 🟢 |
+| src/webgl2_context/drawing.rs | 29 | 0 | 29 | 100.00% 🟢 |
+| src/webgl2_context/ephemeral.rs | 4 | 0 | 4 | 100.00% 🟢 |
+| src/webgl2_context/registry.rs | 9 | 0 | 9 | 100.00% 🟢 |
+| src/webgl2_context/shaders.rs | 139 | 21 | 160 | 86.88% 🟢 |
+| src/webgl2_context/state.rs | 3 | 0 | 3 | 100.00% 🟢 |
+| src/webgl2_context/textures.rs | 59 | 0 | 59 | 100.00% 🟢 |
+| src/webgl2_context/types.rs | 43 | 18 | 61 | 70.49% 🟡 |
+| src/webgpu/adapter.rs | 6 | 1 | 7 | 85.71% 🟢 |
+| src/webgpu/backend.rs | 63 | 19 | 82 | 76.83% 🟡 |
+| src/webgpu/bind_group.rs | 2 | 0 | 2 | 100.00% 🟢 |
+| src/webgpu/buffer.rs | 1 | 2 | 3 | 33.33% 🟡 |
+| src/webgpu/command.rs | 5 | 6 | 11 | 45.45% 🟠 |
+| src/webgpu/shader.rs | 1 | 0 | 1 | 100.00% 🟢 |
+| src/webgpu/texture.rs | 8 | 3 | 11 | 72.73% 🟡 |
+| **Total** | **1240** | **703** | **1943** | **63.82% 🟡** |
 
 ## Top Missed Files
 
 | File | Lines Missed | Illustrative Line | Coverage |
 |---|---|---|---:|
-| src/lib.rs | 298/453 | [1994] `vertex_module_handle: u32,` | 34.22% 🟠 |
-| src/naga_wasm_backend/expressions.rs | 155/425 | [910] `if let Some(handle) = found_global {` | 63.53% 🟡 |
-| src/wasm_gl_emu/rasterizer.rs | 41/57 | [370] `match eq {` | 28.07% 🟠 |
-| src/naga_wasm_backend/control_flow.rs | 30/68 | [489] `let types = super::types::naga_to_wasm_types(` | 55.88% 🟡 |
+| src/lib.rs | 331/482 | [1994] `depth_write_enabled: u32,` | 31.33% 🟠 |
+| src/naga_wasm_backend/expressions.rs | 147/417 | [1135] `if let Some(handle) = found_global {` | 64.75% 🟡 |
+| src/wasm_gl_emu/rasterizer.rs | 42/61 | [370] `match eq {` | 31.15% 🟠 |
+| src/naga_wasm_backend/backend.rs | 30/183 | [497] `func.instruction(&Instruction::End);` | 83.61% 🟢 |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgl2",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "WebGL2 tools to derisk large GPU projects on the web beyond toys and demos.",
   "type": "module",
   "main": "index.js",

package/src/webgl2_context.js

@@ -135,6 +135,17 @@ export class WasmWebGL2RenderingContext {
   SAMPLER_2D = 0x8B5E;
   SAMPLER_3D = 0x8B5F;
   SAMPLER_CUBE = 0x8B60;
+  // Texture units (GL_TEXTURE0 .. GL_TEXTURE7)
+  TEXTURE0 = 0x84C0;
+  TEXTURE1 = 0x84C1;
+  TEXTURE2 = 0x84C2;
+  TEXTURE3 = 0x84C3;
+  TEXTURE4 = 0x84C4;
+  TEXTURE5 = 0x84C5;
+  TEXTURE6 = 0x84C6;
+  TEXTURE7 = 0x84C7;
+  // Max combined texture image units
+  MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8B4D;
   ACTIVE_UNIFORMS = 0x8B86;
   ACTIVE_ATTRIBUTES = 0x8B89;
   VIEWPORT = 0x0BA2;
@@ -2219,8 +2230,13 @@ export class WasmWebGL2RenderingContext {
       throw new Error('wasm_ctx_get_parameter not found');
     }
 
-    if (pname === 0x8869 /* MAX_VERTEX_ATTRIBS */) {
-      return 16;
+    // Some parameters (like MAX_COMBINED_TEXTURE_IMAGE_UNITS) may not be
+    // implemented in the WASM context. Provide sane defaults to keep test
+    // harnesses running without requiring a full GL backend.
+    if (pname === this.MAX_COMBINED_TEXTURE_IMAGE_UNITS) {
+      // Provide at least 8 texture units which is sufficient for the kernels
+      // used in the test suite.
+      return 8;
     }
 
     const ptr = ex.wasm_ctx_get_parameter(this._ctxHandle, pname);
@@ -2230,71 +2246,67 @@ export class WasmWebGL2RenderingContext {
 
     const dv = new DataView(ex.memory.buffer);
 
-    if (pname === 0x1F00 || pname === 0x1F01 || pname === 0x1F02 || pname === 0x8B8C) {
-      const len = dv.getUint32(ptr - 16, true);
-      const bytes = new Uint8Array(ex.memory.buffer, ptr, len);
-      return new TextDecoder().decode(bytes);
-    }
-
-    if (pname === 0x0BA2 /* VIEWPORT */) {
-      return new Int32Array(ex.memory.buffer.slice(ptr, ptr + 16));
-    }
-
-    if (pname === 0x0C22 /* COLOR_CLEAR_VALUE */) {
-      return new Float32Array(ex.memory.buffer.slice(ptr, ptr + 16));
-    }
-
-    if (pname === 0x0C23 /* COLOR_WRITEMASK */) {
-      const mem = new Uint8Array(ex.memory.buffer, ptr, 4);
-      return [mem[0] !== 0, mem[1] !== 0, mem[2] !== 0, mem[3] !== 0];
-    }
-
-    if (pname === 0x8CA6 /* DRAW_FRAMEBUFFER_BINDING */ || pname === 0x8CAA /* READ_FRAMEBUFFER_BINDING */) {
-      const handle = dv.getInt32(ptr, true);
-      if (handle === 0) return null;
-      return this._fbHandles.get(handle) || null;
-    }
+    switch (pname) {
+      case this.VENDOR:
+      case this.RENDERER:
+      case this.VERSION:
+      case this.SHADING_LANGUAGE_VERSION: {
+        const len = dv.getUint32(ptr - 16, true);
+        const bytes = new Uint8Array(ex.memory.buffer, ptr, len);
+        return new TextDecoder().decode(bytes);
+      }
 
-    if (pname === 0x8CA7 /* RENDERBUFFER_BINDING */) {
-      const handle = dv.getInt32(ptr, true);
-      if (handle === 0) return null;
-      return this._rbHandles.get(handle) || null;
-    }
+      case this.VIEWPORT:
+        return new Int32Array(ex.memory.buffer.slice(ptr, ptr + 16));
 
-    if (pname === 0x8824 /* MAX_DRAW_BUFFERS */ || pname === 0x8CDF /* MAX_COLOR_ATTACHMENTS */) {
-      return dv.getInt32(ptr, true);
-    }
+      case this.COLOR_CLEAR_VALUE:
+        return new Float32Array(ex.memory.buffer.slice(ptr, ptr + 16));
 
-    if (pname >= 0x8825 /* DRAW_BUFFER0 */ && pname <= 0x882C /* DRAW_BUFFER7 */) {
-      return dv.getInt32(ptr, true);
-    }
-
-    if (pname === 0x0B72 /* DEPTH_WRITEMASK */) {
-      return dv.getUint8(ptr) !== 0;
-    }
+      case this.COLOR_WRITEMASK: {
+        const mem = new Uint8Array(ex.memory.buffer, ptr, 4);
+        return [mem[0] !== 0, mem[1] !== 0, mem[2] !== 0, mem[3] !== 0];
+      }
 
-    if (pname === 0x0B98 /* STENCIL_WRITEMASK */ || pname === 0x8CA5 /* STENCIL_BACK_WRITEMASK */) {
-      return dv.getInt32(ptr, true);
-    }
+      case this.DRAW_FRAMEBUFFER_BINDING:
+      case this.READ_FRAMEBUFFER_BINDING: {
+        const handle = dv.getInt32(ptr, true);
+        if (handle === 0) return null;
+        return this._fbHandles.get(handle) || null;
+      }
 
-    const singleIntParams = [
-      0x0B74, // DEPTH_FUNC
-      0x0B92, // STENCIL_FUNC
-      0x0B93, // STENCIL_VALUE_MASK
-      0x0B97, // STENCIL_REF
-      0x8800, // STENCIL_BACK_FUNC
-      0x8CA4, // STENCIL_BACK_VALUE_MASK
-      0x8CA3, // STENCIL_BACK_REF
-      0x0B94, // STENCIL_FAIL
-      0x0B95, // STENCIL_PASS_DEPTH_FAIL
-      0x0B96, // STENCIL_PASS_DEPTH_PASS
-      0x8801, // STENCIL_BACK_FAIL
-      0x8802, // STENCIL_BACK_PASS_DEPTH_FAIL
-      0x8803, // STENCIL_BACK_PASS_DEPTH_PASS
-    ];
+      case this.RENDERBUFFER_BINDING: {
+        const handle = dv.getInt32(ptr, true);
+        if (handle === 0) return null;
+        return this._rbHandles.get(handle) || null;
+      }
 
-    if (singleIntParams.includes(pname)) {
-      return dv.getInt32(ptr, true);
+      case this.MAX_DRAW_BUFFERS:
+      case this.MAX_COLOR_ATTACHMENTS:
+      case this.MAX_VERTEX_ATTRIBS:
+      case this.STENCIL_WRITEMASK:
+      case this.STENCIL_BACK_WRITEMASK:
+      case this.DEPTH_FUNC:
+      case this.STENCIL_FUNC:
+      case this.STENCIL_VALUE_MASK:
+      case this.STENCIL_REF:
+      case this.STENCIL_BACK_FUNC:
+      case this.STENCIL_BACK_VALUE_MASK:
+      case this.STENCIL_BACK_REF:
+      case this.STENCIL_FAIL:
+      case this.STENCIL_PASS_DEPTH_FAIL:
+      case this.STENCIL_PASS_DEPTH_PASS:
+      case this.STENCIL_BACK_FAIL:
+      case this.STENCIL_BACK_PASS_DEPTH_FAIL:
+      case this.STENCIL_BACK_PASS_DEPTH_PASS:
+        return dv.getInt32(ptr, true);
+
+      case this.DEPTH_WRITEMASK:
+        return dv.getUint8(ptr) !== 0;
+
+      default:
+        if (pname >= this.DRAW_BUFFER0 && pname <= this.DRAW_BUFFER7) {
+          return dv.getInt32(ptr, true);
+        }
     }
 
     throw new Error(`getParameter for ${pname} not implemented`);
@@ -2325,6 +2337,26 @@ export class WasmWebGL2RenderingContext {
     const ex = this._instance.exports;
     return ex.wasm_ctx_is_texture(this._ctxHandle, tex._handle) !== 0;
   }
+
+  // Partial implementation of clearBufferfv. The full WebGL2 specification
+  // supports multiple buffers; for the test harness we only need to clear
+  // the first color attachment (drawbuffer 0) with a float color value.
+  clearBufferfv(target, drawbuffer, values) {
+    this._assertNotDestroyed();
+    // Only support clearing color buffer for now.
+    if (target !== this.COLOR) {
+      throw new Error('clearBufferfv only supports COLOR target in this implementation');
+    }
+    // drawbuffer is typically 0 for these kernels
+    if (drawbuffer !== 0) {
+      throw new Error('clearBufferfv only supports drawbuffer 0 in this implementation');
+    }
+    // values is expected to be a Float32Array or array-like with 4 components.
+    const v = values instanceof Float32Array ? values : new Float32Array(values);
+    // Use existing clearColor / clear path which the WASM backend supports.
+    this.clearColor(v[0], v[1], v[2], v[3]);
+    this.clear(this.COLOR_BUFFER_BIT);
+  }
   isFramebuffer(fb) {
     this._assertNotDestroyed();
     if (!fb || typeof fb !== 'object' || !(fb instanceof WasmWebGLFramebuffer)) return false;