webgl2 1.1.7 → 1.1.9

package/coverage.md

@@ -3,34 +3,35 @@
 > **Legend:** 🟢 ≥80% | 🟡 ≥50% (or ≤6 lines) | 🟠 ≥20% | 🔴 <20%
 
 | File | Lines Covered | Lines Missed | Total Lines | Coverage |
-|---|---|---|---|---|
-| src/lib.rs | 110 | 31 | 141 | 78.01% 🟡 |
-| src/naga_wasm_backend/backend.rs | 45 | 1 | 46 | 97.83% 🟢 |
-| src/naga_wasm_backend/control_flow.rs | 24 | 11 | 35 | 68.57% 🟡 |
+|---|---|---|---|---:|
+| 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 | 32 | 14 | 46 | 69.57% 🟡 |
+| 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 | 15 | 0 | 15 | 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/framebuffers.rs | 7 | 0 | 7 | 100.00% 🟢 |
+| 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 | 14 | 3 | 17 | 82.35% 🟢 |
+| 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 | 9 | 1 | 10 | 90.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 | 2 | 0 | 2 | 100.00% 🟢 |
+| src/webgpu/adapter.rs | 3 | 0 | 3 | 100.00% 🟢 |
 | src/webgpu/backend.rs | 24 | 26 | 50 | 48.00% 🟠 |
-| **Total** | **484** | **95** | **579** | **83.59% 🟢** |
+| **Total** | **521** | **115** | **636** | **81.92% 🟢** |
 
 ## Top Missed Files
 
 | File | Lines Missed | Illustrative Line | Coverage |
-|---|---|---|---|
-| src/lib.rs | 31/141 | [516] `/// Set uniform 3f.` | 78.01% 🟡 |
+|---|---|---|---:|
+| 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 | 14/46 | [11] `pub fn is_integer_type(type_inner: &TypeInner) -> bool {` | 69.57% 🟡 |
-| src/naga_wasm_backend/control_flow.rs | 11/35 | [171] `for i in (0..types.len()).rev() {` | 68.57% 🟡 |
+| 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/index.js

@@ -45,7 +45,7 @@ const isNode =
  * This function:
  * 1. Auto-loads webgl2.wasm (expects it next to index2.js)
  * 2. Instantiates the WASM module with memory
- * 3. Creates a Rust-owned context via wasm_create_context()
+ * 3. Creates a Rust-owned context via wasm_create_context_with_flags(flags)
  * 4. Returns a WasmWebGL2RenderingContext JS wrapper
  *
  * @param {{
@@ -83,21 +83,25 @@ export async function webGL2({ debug = (typeof process !== 'undefined' ? process
     ex.wasm_init_coverage(numEntries);
   }
 
-  // Create a context in WASM
-  const ctxHandle = ex.wasm_create_context();
+  // Determine debug flags for creation
+  const debugShaders = debug === true || debug === 'shaders' || debug === 'all';
+  const debugRust = debug === true || debug === 'rust' || debug === 'all';
+  const flags = (debugShaders ? 1 : 0); // only shader debug encoded in flags
+
+  // Default size to 640x480 if not provided
+  const width = size?.width ?? 640;
+  const height = size?.height ?? 480;
+
+  // Create a context in WASM using the flags-aware API (mandatory)
+  const ctxHandle = ex.wasm_create_context_with_flags(flags, width, height);
+
   if (ctxHandle === 0) {
     const msg = readErrorMessage(instance);
     throw new Error(`Failed to create context: ${msg}`);
   }
 
-  // Wrap and return
-  const gl = new WasmWebGL2RenderingContext(instance, ctxHandle);
-  
-  // Set debug mode if requested
-  if (debug) {
-    gl.setDebugMode(debug);
-  }
-  
+  // Wrap and return, pass debug booleans to the JS wrapper
+  const gl = new WasmWebGL2RenderingContext({ instance, ctxHandle, width, height, debugShaders: !!debugShaders });
 
   if (size && typeof size.width === 'number' && typeof size.height === 'number') {
     gl.resize(size.width, size.height);
@@ -185,8 +189,8 @@ async function initWASM({ debug } = {}) {
 
   // Verify required exports
   const ex = instance.exports;
-  if (typeof ex.wasm_create_context !== 'function') {
-    throw new Error('WASM module missing wasm_create_context export');
+  if (typeof ex.wasm_create_context_with_flags !== 'function') {
+    throw new Error('WASM module missing wasm_create_context_with_flags export');
   }
   if (!(ex.memory instanceof WebAssembly.Memory)) {
     throw new Error('WASM module missing memory export');

package/package.json

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

@@ -96,37 +96,22 @@ export class WasmWebGL2RenderingContext {
   /**
    * @param {WebAssembly.Instance} instance
    * @param {u32} ctxHandle
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} [debugShaders]
    */
-  constructor(instance, ctxHandle) {
+  constructor({ instance, ctxHandle, width, height, debugShaders = false }) {
     this._instance = instance;
     this._ctxHandle = ctxHandle;
     this._destroyed = false;
     /** @type {import('./webgl2_resources.js').WasmWebGLProgram | null} */
     this._currentProgram = null;
-    this._debugMode = 0; // 0=None, 1=Shaders, 2=Rust, 3=All
-    this._drawingBufferWidth = 640;
-    this._drawingBufferHeight = 480;
-
-    WasmWebGL2RenderingContext._contexts.set(ctxHandle, this);
-  }
-
-  setDebugMode(mode) {
-    this._assertNotDestroyed();
-    const ex = this._instance.exports;
-    if (!ex || typeof ex.wasm_ctx_set_debug_mode !== 'function') {
-      console.warn('wasm_ctx_set_debug_mode not found');
-      return;
-    }
-
-    let modeVal = 0;
-    if (mode === true || mode === 'all') modeVal = 3;
-    else if (mode === 'shaders') modeVal = 1;
-    else if (mode === 'rust') modeVal = 2;
-    else modeVal = 0;
+    // Explicit booleans for clarity
+    this._debugShaders = !!debugShaders;
+    this._drawingBufferWidth = width;
+    this._drawingBufferHeight = height;
 
-    this._debugMode = modeVal;
-    const code = ex.wasm_ctx_set_debug_mode(this._ctxHandle, modeVal);
-    _checkErr(code, this._instance);
+    WasmWebGL2RenderingContext._contexts.set(this._ctxHandle, this);
   }
 
   get drawingBufferWidth() {
@@ -177,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}`);
     }
   }
 
@@ -533,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);
+      }
     }
   }
 
@@ -544,7 +533,7 @@ export class WasmWebGL2RenderingContext {
     const fsWasm = this.getProgramWasm(program, this.FRAGMENT_SHADER);
 
     const createDebugEnv = (type, instanceRef) => {
-      if (this._debugMode !== 1 && this._debugMode !== 3) return {};
+      if (!this._debugShaders) return {};
 
       const stubCode = this.getProgramDebugStub(program, type);
       if (!stubCode) return {};
@@ -564,6 +553,10 @@ export class WasmWebGL2RenderingContext {
 
       return {
         debug_step: (line, funcIdx, resultPtr) => {
+          if (line === 999999) {
+            console.log(`DEBUG LOG: val=${funcIdx} (0x${(funcIdx >>> 0).toString(16)})`);
+            return;
+          }
           const func = stubFuncs[line - 1];
           if (func) {
             const ctx = {
@@ -582,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) {
@@ -1363,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);