webgl2 1.1.8 → 1.1.9

package/coverage.md

@@ -4,33 +4,34 @@
 
 | File | Lines Covered | Lines Missed | Total Lines | Coverage |
 |---|---|---|---|---:|
-| src/lib.rs | 108 | 30 | 138 | 78.26% 🟡 |
-| src/naga_wasm_backend/backend.rs | 43 | 2 | 45 | 95.56% 🟢 |
-| src/naga_wasm_backend/control_flow.rs | 25 | 11 | 36 | 69.44% 🟡 |
+| src/lib.rs | 110 | 29 | 139 | 79.14% 🟡 |
+| src/naga_wasm_backend/backend.rs | 43 | 1 | 44 | 97.73% 🟢 |
+| src/naga_wasm_backend/control_flow.rs | 30 | 12 | 42 | 71.43% 🟡 |
 | src/naga_wasm_backend/debug/stub.rs | 20 | 0 | 20 | 100.00% 🟢 |
-| src/naga_wasm_backend/expressions.rs | 41 | 19 | 60 | 68.33% 🟡 |
-| src/naga_wasm_backend/types.rs | 7 | 0 | 7 | 100.00% 🟢 |
+| src/naga_wasm_backend/expressions.rs | 40 | 19 | 59 | 67.80% 🟡 |
+| src/naga_wasm_backend/output_layout.rs | 1 | 1 | 2 | 50.00% 🟡 |
+| src/naga_wasm_backend/types.rs | 6 | 0 | 6 | 100.00% 🟢 |
 | src/wasm_gl_emu/framebuffer.rs | 1 | 0 | 1 | 100.00% 🟢 |
-| src/wasm_gl_emu/rasterizer.rs | 14 | 0 | 14 | 100.00% 🟢 |
+| src/wasm_gl_emu/rasterizer.rs | 20 | 2 | 22 | 90.91% 🟢 |
 | src/webgl2_context/buffers.rs | 15 | 1 | 16 | 93.75% 🟢 |
-| src/webgl2_context/drawing.rs | 29 | 4 | 33 | 87.88% 🟢 |
+| src/webgl2_context/drawing.rs | 34 | 7 | 41 | 82.93% 🟢 |
 | src/webgl2_context/framebuffers.rs | 8 | 0 | 8 | 100.00% 🟢 |
 | src/webgl2_context/registry.rs | 5 | 0 | 5 | 100.00% 🟢 |
-| src/webgl2_context/renderbuffers.rs | 10 | 0 | 10 | 100.00% 🟢 |
-| src/webgl2_context/shaders.rs | 70 | 3 | 73 | 95.89% 🟢 |
-| src/webgl2_context/state.rs | 13 | 3 | 16 | 81.25% 🟢 |
+| src/webgl2_context/renderbuffers.rs | 11 | 0 | 11 | 100.00% 🟢 |
+| src/webgl2_context/shaders.rs | 80 | 13 | 93 | 86.02% 🟢 |
+| src/webgl2_context/state.rs | 14 | 2 | 16 | 87.50% 🟢 |
 | src/webgl2_context/textures.rs | 10 | 0 | 10 | 100.00% 🟢 |
-| src/webgl2_context/types.rs | 11 | 1 | 12 | 91.67% 🟢 |
-| src/webgl2_context/vaos.rs | 37 | 0 | 37 | 100.00% 🟢 |
+| src/webgl2_context/types.rs | 10 | 2 | 12 | 83.33% 🟢 |
+| src/webgl2_context/vaos.rs | 36 | 0 | 36 | 100.00% 🟢 |
 | src/webgpu/adapter.rs | 3 | 0 | 3 | 100.00% 🟢 |
-| src/webgpu/backend.rs | 25 | 25 | 50 | 50.00% 🟡 |
-| **Total** | **495** | **99** | **594** | **83.33% 🟢** |
+| src/webgpu/backend.rs | 24 | 26 | 50 | 48.00% 🟠 |
+| **Total** | **521** | **115** | **636** | **81.92% 🟢** |
 
 ## Top Missed Files
 
 | File | Lines Missed | Illustrative Line | Coverage |
 |---|---|---|---:|
-| src/lib.rs | 30/138 | [516] `/// Set uniform 3f.` | 78.26% 🟡 |
-| src/webgpu/backend.rs | 25/50 | [919] `}` | 50.00% 🟡 |
-| src/naga_wasm_backend/expressions.rs | 19/60 | [11] `pub fn is_integer_type(type_inner: &TypeInner) -> bool {` | 68.33% 🟡 |
-| src/naga_wasm_backend/control_flow.rs | 11/36 | [181] `for i in (0..types.len()).rev() {` | 69.44% 🟡 |
+| src/lib.rs | 29/139 | [1011] `#[no_mangle]` | 79.14% 🟡 |
+| src/webgpu/backend.rs | 26/50 | [919] `}` | 48.00% 🟠 |
+| src/naga_wasm_backend/expressions.rs | 19/59 | [11] `pub fn is_integer_type(type_inner: &TypeInner) -> bool {` | 67.80% 🟡 |
+| src/webgl2_context/shaders.rs | 13/93 | [575] `if !varying_locations.values().any(|&v| v == *loc) {` | 86.02% 🟢 |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgl2",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "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

@@ -162,8 +162,6 @@ export class WasmWebGL2RenderingContext {
         console.error(`  attrPtr: ${attrPtr}, uniformPtr: ${uniformPtr}, varyingPtr: ${varyingPtr}, privatePtr: ${privatePtr}, texturePtr: ${texturePtr}`);
         throw e;
       }
-    } else {
-      // console.log(`DEBUG: Shader instance or main missing for type ${type}. Instance: ${!!shaderInstance}`);
     }
   }
 
@@ -518,9 +516,15 @@ export class WasmWebGL2RenderingContext {
     const code = ex.wasm_ctx_link_program(this._ctxHandle, programHandle);
     _checkErr(code, this._instance);
 
-    // After linking, we need to instantiate the WASM modules on the host
+    // After linking, we need to instantiate the WASM modules on the host.
+    // According to the WebGL 2.0 Spec (https://registry.khronos.org/webgl/specs/latest/2.0/#3.7.6),
+    // linkProgram sets the LINK_STATUS parameter. If linking fails, no executable is generated.
+    // We must check LINK_STATUS before attempting to instantiate the WASM, as getProgramWasm will return null.
     if (program && typeof program === 'object') {
-      this._instantiateProgramShaders(program);
+      const linkStatus = this.getProgramParameter(program, this.LINK_STATUS);
+      if (linkStatus) {
+        this._instantiateProgramShaders(program);
+      }
     }
   }
 
@@ -571,40 +575,29 @@ export class WasmWebGL2RenderingContext {
       };
     };
 
-    if (vsWasm) {
-      try {
-        const vsModule = new WebAssembly.Module(vsWasm);
-        const instanceRef = { current: null };
-        const debugEnv = createDebugEnv(this.VERTEX_SHADER, instanceRef);
-
-        program._vsInstance = new WebAssembly.Instance(vsModule, {
-          env: {
-            memory: this._instance.exports.memory,
-            ...debugEnv
-          }
-        });
-        instanceRef.current = program._vsInstance;
-      } catch (e) {
-        console.log(`DEBUG: VS Instance creation failed: ${e}`);
+    const vsModule = new WebAssembly.Module(vsWasm);
+    const vsInstanceRef = { current: null };
+    const vsDebugEnv = createDebugEnv(this.VERTEX_SHADER, vsInstanceRef);
+
+    program._vsInstance = new WebAssembly.Instance(vsModule, {
+      env: {
+        memory: this._instance.exports.memory,
+        ...vsDebugEnv
       }
-    }
-    if (fsWasm) {
-      try {
-        const fsModule = new WebAssembly.Module(fsWasm);
-        const instanceRef = { current: null };
-        const debugEnv = createDebugEnv(this.FRAGMENT_SHADER, instanceRef);
-
-        program._fsInstance = new WebAssembly.Instance(fsModule, {
-          env: {
-            memory: this._instance.exports.memory,
-            ...debugEnv
-          }
-        });
-        instanceRef.current = program._fsInstance;
-      } catch (e) {
-        console.log(`DEBUG: FS Instance creation failed: ${e}`);
+    });
+    vsInstanceRef.current = program._vsInstance;
+
+    const fsModule = new WebAssembly.Module(fsWasm);
+    const fsInstanceRef = { current: null };
+    const fsDebugEnv = createDebugEnv(this.FRAGMENT_SHADER, fsInstanceRef);
+
+    program._fsInstance = new WebAssembly.Instance(fsModule, {
+      env: {
+        memory: this._instance.exports.memory,
+        ...fsDebugEnv
       }
-    }
+    });
+    fsInstanceRef.current = program._fsInstance;
   }
 
   getProgramDebugStub(program, shaderType) {
@@ -1352,7 +1345,8 @@ export class WasmWebGL2RenderingContext {
     try {
       const mem = new Uint8Array(ex.memory.buffer);
       mem.set(bytes, ptr);
-      const code = ex.wasm_ctx_uniform_matrix_4fv(this._ctxHandle, locHandle, transpose ? 1 : 0, ptr, len);
+      const count = len / 4;
+      const code = ex.wasm_ctx_uniform_matrix_4fv(this._ctxHandle, locHandle, transpose ? 1 : 0, ptr, count);
       _checkErr(code, this._instance);
     } finally {
       ex.wasm_free(ptr);