webgl2 1.2.1 → 1.2.4

package/coverage.md

@@ -4,52 +4,43 @@
 
 | File | Lines Covered | Lines Missed | Total Lines | Coverage |
 |---|---|---|---|---:|
-| src/decompiler/ast.rs | 0 | 1 | 1 | 0.00% 🟡 |
-| src/decompiler/emitter.rs | 17 | 8 | 25 | 68.00% 🟡 |
-| src/decompiler/lifter.rs | 17 | 21 | 38 | 44.74% 🟠 |
-| src/decompiler/mod.rs | 8 | 6 | 14 | 57.14% 🟡 |
-| src/decompiler/module.rs | 3 | 1 | 4 | 75.00% 🟡 |
-| src/decompiler/parser.rs | 15 | 2 | 17 | 88.24% 🟢 |
-| src/decompiler/simplifier.rs | 54 | 19 | 73 | 73.97% 🟡 |
-| src/error.rs | 8 | 15 | 23 | 34.78% 🟠 |
-| src/lib.rs | 314 | 224 | 538 | 58.36% 🟡 |
-| src/naga_wasm_backend/backend.rs | 62 | 2 | 64 | 96.88% 🟢 |
-| src/naga_wasm_backend/call_lowering.rs | 19 | 0 | 19 | 100.00% 🟢 |
-| src/naga_wasm_backend/control_flow.rs | 30 | 40 | 70 | 42.86% 🟠 |
-| src/naga_wasm_backend/debug/stub.rs | 20 | 0 | 20 | 100.00% 🟢 |
-| src/naga_wasm_backend/expressions.rs | 65 | 109 | 174 | 37.36% 🟠 |
-| src/naga_wasm_backend/function_abi.rs | 25 | 0 | 25 | 100.00% 🟢 |
-| src/naga_wasm_backend/functions/prep.rs | 4 | 0 | 4 | 100.00% 🟢 |
-| src/naga_wasm_backend/functions/registry.rs | 4 | 0 | 4 | 100.00% 🟢 |
-| src/naga_wasm_backend/memory_layout.rs | 9 | 0 | 9 | 100.00% 🟢 |
-| src/naga_wasm_backend/mod.rs | 1 | 0 | 1 | 100.00% 🟢 |
-| src/naga_wasm_backend/output_layout.rs | 4 | 2 | 6 | 66.67% 🟡 |
-| src/naga_wasm_backend/types.rs | 11 | 0 | 11 | 100.00% 🟢 |
-| src/wasm_gl_emu/device.rs | 20 | 4 | 24 | 83.33% 🟢 |
+| src/coverage.rs | 18 | 1 | 19 | 94.74% 🟢 |
+| src/decompiler/ast.rs | 4 | 0 | 4 | 100.00% 🟢 |
+| src/decompiler/emitter.rs | 35 | 2 | 37 | 94.59% 🟢 |
+| src/decompiler/lifter.rs | 11 | 14 | 25 | 44.00% 🟠 |
+| src/decompiler/simplifier.rs | 30 | 1 | 31 | 96.77% 🟢 |
+| src/error.rs | 13 | 2 | 15 | 86.67% 🟢 |
+| src/lib.rs | 87 | 299 | 386 | 22.54% 🟠 |
+| src/naga_wasm_backend/backend.rs | 173 | 24 | 197 | 87.82% 🟢 |
+| src/naga_wasm_backend/call_lowering.rs | 22 | 3 | 25 | 88.00% 🟢 |
+| src/naga_wasm_backend/control_flow.rs | 37 | 41 | 78 | 47.44% 🟠 |
+| src/naga_wasm_backend/debug/stub.rs | 25 | 9 | 34 | 73.53% 🟡 |
+| src/naga_wasm_backend/expressions.rs | 143 | 155 | 298 | 47.99% 🟠 |
+| src/naga_wasm_backend/function_abi.rs | 31 | 0 | 31 | 100.00% 🟢 |
+| src/naga_wasm_backend/functions/prep.rs | 4 | 2 | 6 | 66.67% 🟡 |
+| src/naga_wasm_backend/functions/registry.rs | 0 | 1 | 1 | 0.00% 🟡 |
+| src/naga_wasm_backend/memory_layout.rs | 16 | 4 | 20 | 80.00% 🟢 |
+| src/naga_wasm_backend/mod.rs | 5 | 5 | 10 | 50.00% 🟡 |
+| src/naga_wasm_backend/output_layout.rs | 2 | 1 | 3 | 66.67% 🟡 |
+| src/wasm_gl_emu/device.rs | 49 | 12 | 61 | 80.33% 🟢 |
 | src/wasm_gl_emu/framebuffer.rs | 3 | 1 | 4 | 75.00% 🟡 |
-| src/wasm_gl_emu/rasterizer.rs | 32 | 18 | 50 | 64.00% 🟡 |
-| src/wasm_gl_emu/transfer.rs | 19 | 7 | 26 | 73.08% 🟡 |
-| src/webgl2_context/blend.rs | 0 | 3 | 3 | 0.00% 🟡 |
-| src/webgl2_context/buffers.rs | 20 | 4 | 24 | 83.33% 🟢 |
-| src/webgl2_context/drawing.rs | 13 | 0 | 13 | 100.00% 🟢 |
-| src/webgl2_context/framebuffers.rs | 11 | 1 | 12 | 91.67% 🟢 |
-| src/webgl2_context/registry.rs | 7 | 0 | 7 | 100.00% 🟢 |
-| src/webgl2_context/renderbuffers.rs | 10 | 0 | 10 | 100.00% 🟢 |
-| src/webgl2_context/shaders.rs | 112 | 14 | 126 | 88.89% 🟢 |
-| src/webgl2_context/state.rs | 16 | 4 | 20 | 80.00% 🟢 |
-| src/webgl2_context/textures.rs | 25 | 9 | 34 | 73.53% 🟡 |
-| src/webgl2_context/types.rs | 16 | 0 | 16 | 100.00% 🟢 |
-| src/webgl2_context/vaos.rs | 35 | 0 | 35 | 100.00% 🟢 |
-| src/webgpu/adapter.rs | 2 | 0 | 2 | 100.00% 🟢 |
-| src/webgpu/backend.rs | 70 | 26 | 96 | 72.92% 🟡 |
-| src/webgpu/command.rs | 3 | 1 | 4 | 75.00% 🟡 |
-| **Total** | **1104** | **542** | **1646** | **67.07% 🟡** |
+| src/wasm_gl_emu/rasterizer.rs | 52 | 58 | 110 | 47.27% 🟠 |
+| src/wasm_gl_emu/transfer.rs | 11 | 16 | 27 | 40.74% 🟠 |
+| src/webgl2_context/shaders.rs | 160 | 14 | 174 | 91.95% 🟢 |
+| src/webgl2_context/state.rs | 80 | 1 | 81 | 98.77% 🟢 |
+| src/webgl2_context/textures.rs | 22 | 7 | 29 | 75.86% 🟡 |
+| src/webgl2_context/types.rs | 52 | 14 | 66 | 78.79% 🟡 |
+| src/webgl2_context/vaos.rs | 25 | 19 | 44 | 56.82% 🟡 |
+| src/webgpu/adapter.rs | 3 | 2 | 5 | 60.00% 🟡 |
+| src/webgpu/backend.rs | 68 | 20 | 88 | 77.27% 🟡 |
+| src/webgpu/command.rs | 1 | 1 | 2 | 50.00% 🟡 |
+| **Total** | **1182** | **729** | **1911** | **61.85% 🟡** |
 
 ## Top Missed Files
 
 | File | Lines Missed | Illustrative Line | Coverage |
 |---|---|---|---:|
-| src/lib.rs | 224/538 | [1033] `/// Use a program.` | 58.36% 🟡 |
-| src/naga_wasm_backend/expressions.rs | 109/174 | [1504] `for j in 0..count {` | 37.36% 🟠 |
-| src/naga_wasm_backend/control_flow.rs | 40/70 | [218] `for (s, s_span) in body.span_iter() {` | 42.86% 🟠 |
-| src/webgpu/backend.rs | 26/96 | [1404] `}` | 72.92% 🟡 |
+| src/lib.rs | 299/386 | [1994] `) -> u32 {` | 22.54% 🟠 |
+| src/naga_wasm_backend/expressions.rs | 155/298 | [1845] `translate_expression(*argument, ctx)?;` | 47.99% 🟠 |
+| src/wasm_gl_emu/rasterizer.rs | 58/110 | [370] `match eq {` | 47.27% 🟠 |
+| src/naga_wasm_backend/control_flow.rs | 41/78 | [535] `let types = super::types::naga_to_wasm_types(` | 47.44% 🟠 |

package/demo.js

@@ -19,7 +19,8 @@ const animationState = {
 // Global rendering context (lazy initialized)
 let renderContext = null;
 
-async function initializeRenderContext() {
+/** @param {{ useBilinear?: boolean }} [options] */
+async function initializeRenderContext({ useBilinear } = {}) {
     if (renderContext) return renderContext;
 
     let loadLocal =
@@ -35,6 +36,7 @@ async function initializeRenderContext() {
 
     const gl = await webGL2({ debug: true });
     gl.viewport(0, 0, 640, 480);
+    gl.enable(gl.DEPTH_TEST);
 
     // Shaders
     const vsSource = /* glsl */`#version 300 es
@@ -164,6 +166,10 @@ async function initializeRenderContext() {
         }
     }
     gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 16, 16, 0, gl.RGBA, gl.UNSIGNED_BYTE, texData);
+    if (!useBilinear) {
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
+    }
 
     const uTextureLoc = gl.getUniformLocation(program, "u_texture");
     gl.uniform1i(uTextureLoc, 0);
@@ -254,8 +260,10 @@ async function initializeRenderContext() {
     return renderContext;
 }
 
-async function renderCube(elapsedTime = 0) {
-    const ctx = await initializeRenderContext();
+async function renderCube({ elapsedTime, useBilinear } = {}) {
+    if (!elapsedTime) elapsedTime = 0;
+
+    const ctx = await initializeRenderContext({ useBilinear });
     const { gl, program, mvpLoc, perspective, translate, rotateX, rotateY, multiply } = ctx;
 
     // Calculate rotation angle: 1 full rotation (2π) in 5 seconds
@@ -549,7 +557,7 @@ async function animate() {
     if (!animationState.running) return;
 
     const elapsedTime = Date.now() - animationState.startTime;
-    const result = await renderCube(elapsedTime);
+    const result = await renderCube({ elapsedTime });
     const { pixels, width, height } = result;
 
     await displayFrame(pixels, width, height);
@@ -599,7 +607,7 @@ async function runTerminalAnimation(width, height, duration = 20000) {
         const avgFps = elapsedTime > 0 ? Math.round((frameCount * 1000) / elapsedTime) : 0;
 
         // Render cube with current rotation
-        const result = await renderCube(elapsedTime);
+        const result = await renderCube({ elapsedTime, useBilinear: true });
         const { pixels } = result;
 
         // Generate ASCII art

package/index.js

@@ -10,14 +10,14 @@ import {
   getShaderGlsl,
   decompileWasmToGlsl
 } from './src/webgl2_context.js';
-import { GPU, GPUBufferUsage, GPUMapMode, GPUTextureUsage } from './src/webgpu_context.js';
+import { GPU, GPUBufferUsage, GPUMapMode, GPUTextureUsage, GPUShaderStage } from './src/webgpu_context.js';
 
 export const debug = {
   getLcovReport,
   resetLcovReport
 };
 
-export { ERR_OK, ERR_INVALID_HANDLE, GPUBufferUsage, GPUMapMode, GPUTextureUsage, getShaderModule, getShaderWat, getShaderGlsl, decompileWasmToGlsl };
+export { ERR_OK, ERR_INVALID_HANDLE, GPUBufferUsage, GPUMapMode, GPUTextureUsage, GPUShaderStage, getShaderModule, getShaderWat, getShaderGlsl, decompileWasmToGlsl };
 
 /**
  * Simple allocator for function table indices.
@@ -25,9 +25,10 @@ export { ERR_OK, ERR_INVALID_HANDLE, GPUBufferUsage, GPUMapMode, GPUTextureUsage
  */
 class TableAllocator {
   constructor() {
-    // Rust uses the first ~1900 slots for its indirect function table (dyn calls, etc).
-    // We must valid collision by starting allocations after that region.
-    this.nextIndex = 2000;
+    // Rust uses many slots for its indirect function table (dyn calls, etc).
+    // We must avoid collision by starting allocations after that region.
+    // Increased from 2000 to 5000 for safety in larger modules.
+    this.nextIndex = 5000;
     this.freeList = [];
   }
 
@@ -99,7 +100,7 @@ export async function webGL2({ debug = (typeof process !== 'undefined' ? process
       }
     });
   }
-  const { ex, instance, sharedTable, tableAllocator } = await promise;
+  const { ex, instance, sharedTable, tableAllocator, turboGlobals } = await promise;
 
   // Initialize coverage if available
   if (ex.wasm_init_coverage && ex.COV_MAP_PTR) {
@@ -136,7 +137,8 @@ export async function webGL2({ debug = (typeof process !== 'undefined' ? process
     height,
     debugShaders: !!debugShaders,
     sharedTable,
-    tableAllocator
+    tableAllocator,
+    turboGlobals
   });
 
   if (size && typeof size.width === 'number' && typeof size.height === 'number') {
@@ -167,15 +169,22 @@ export async function webGPU({ debug = (typeof process !== 'undefined' ? process
       }
     });
   }
-  const { ex, instance } = await promise;
+
+  // Resolve the WASM initialization and return a WebGPU wrapper (GPU).
+  // Tests expect an object with `requestAdapter()`; return a `GPU` instance
+  // backed by the WASM exports and memory.
+  const { ex } = await promise;
   return new GPU(ex, ex.memory);
 }
 
 /**
- * @type {Map<boolean, Promise<{ ex: WebAssembly.Exports, instance: WebAssembly.Instance, module: WebAssembly.Module }>>}
+ * @type {Map<boolean, ReturnType<typeof initWASM>>}
  */
 const wasmCache = new Map();
 
+/**
+ * @param {{ debug?: boolean }} [options]
+ */
 async function initWASM({ debug } = {}) {
   const wasmFile = debug ? 'webgl2.debug.wasm' : 'webgl2.wasm';
   let wasmBuffer;
@@ -202,39 +211,47 @@ async function initWASM({ debug } = {}) {
   // Compile WASM module
   const wasmModule = await WebAssembly.compile(wasmBuffer);
 
-  // Instantiate WASM (no imports needed, memory is exported)
+  /**
+   * Instantiate WASM (no imports needed, memory is exported)
+   * @type {WebAssembly.Instance}
+   */
   let instance;
 
   // Create shared function table for direct shader calls
   const sharedTable = new WebAssembly.Table({
-    initial: 4096,   // Increased from 4096 to handle larger modules
-    maximum: 8192,   // Prevent unbounded growth
+    initial: 8192,
+    maximum: 65536,
     element: "anyfunc"
   });
   const tableAllocator = new TableAllocator();
 
+  // Create shared mutable globals that will be used by both the main module and
+  // transient shader modules. These are WebAssembly.Global objects with mutable
+  // i32 value so shaders can update pointer state directly.
+  const turboGlobals = {
+    ACTIVE_ATTR_PTR: new WebAssembly.Global({ value: 'i32', mutable: true }, 0),
+    ACTIVE_UNIFORM_PTR: new WebAssembly.Global({ value: 'i32', mutable: true }, 0),
+    ACTIVE_VARYING_PTR: new WebAssembly.Global({ value: 'i32', mutable: true }, 0),
+    ACTIVE_PRIVATE_PTR: new WebAssembly.Global({ value: 'i32', mutable: true }, 0),
+    ACTIVE_TEXTURE_PTR: new WebAssembly.Global({ value: 'i32', mutable: true }, 0),
+    ACTIVE_FRAME_SP: new WebAssembly.Global({ value: 'i32', mutable: true }, 0),
+  };
+
   const importObject = {
     env: {
       __indirect_function_table: sharedTable,  // Exact name LLVM expects
+      memory: new WebAssembly.Memory({ initial: 100 }),
+      ACTIVE_ATTR_PTR: turboGlobals.ACTIVE_ATTR_PTR,
+      ACTIVE_UNIFORM_PTR: turboGlobals.ACTIVE_UNIFORM_PTR,
+      ACTIVE_VARYING_PTR: turboGlobals.ACTIVE_VARYING_PTR,
+      ACTIVE_PRIVATE_PTR: turboGlobals.ACTIVE_PRIVATE_PTR,
+      ACTIVE_TEXTURE_PTR: turboGlobals.ACTIVE_TEXTURE_PTR,
+      ACTIVE_FRAME_SP: turboGlobals.ACTIVE_FRAME_SP,
       print: (ptr, len) => {
         const mem = new Uint8Array(instance.exports.memory.buffer);
         const bytes = mem.subarray(ptr, ptr + len);
         console.log(new TextDecoder('utf-8').decode(bytes));
       },
-      wasm_execute_shader: (ctx, type, tableIdx, attrPtr, uniformPtr, varyingPtr, privatePtr, texturePtr) => {
-        const gl = WasmWebGL2RenderingContext._contexts.get(ctx);
-        if (gl) {
-          gl._executeShader(type, tableIdx, attrPtr, uniformPtr, varyingPtr, privatePtr, texturePtr);
-        } else {
-            // General device execution (WebGPU)
-            if (tableIdx > 0 && sharedTable) {
-                const func = sharedTable.get(tableIdx);
-                if (func) {
-                    func(ctx, type, tableIdx, attrPtr, uniformPtr, varyingPtr, privatePtr, texturePtr);
-                }
-            }
-        }
-      },
       wasm_register_shader: (ptr, len) => {
         const mem = new Uint8Array(instance.exports.memory.buffer);
         const bytes = mem.slice(ptr, ptr + len);
@@ -244,6 +261,12 @@ async function initWASM({ debug } = {}) {
         const env = {
           memory: instance.exports.memory,
           __indirect_function_table: sharedTable,
+          ACTIVE_ATTR_PTR: turboGlobals.ACTIVE_ATTR_PTR,
+          ACTIVE_UNIFORM_PTR: turboGlobals.ACTIVE_UNIFORM_PTR,
+          ACTIVE_VARYING_PTR: turboGlobals.ACTIVE_VARYING_PTR,
+          ACTIVE_PRIVATE_PTR: turboGlobals.ACTIVE_PRIVATE_PTR,
+          ACTIVE_TEXTURE_PTR: turboGlobals.ACTIVE_TEXTURE_PTR,
+          ACTIVE_FRAME_SP: turboGlobals.ACTIVE_FRAME_SP,
         };
         
         // Copy math functions
@@ -265,6 +288,22 @@ async function initWASM({ debug } = {}) {
         }
         return index;
       },
+      wasm_release_shader_index: (idx) => {
+        tableAllocator.free(idx);
+      },
+      wasm_sync_turbo_globals: (attr, uniform, varying, private_, texture, frame_sp) => {
+        try {
+          turboGlobals.ACTIVE_ATTR_PTR.value = attr >>> 0;
+          turboGlobals.ACTIVE_UNIFORM_PTR.value = uniform >>> 0;
+          turboGlobals.ACTIVE_VARYING_PTR.value = varying >>> 0;
+          turboGlobals.ACTIVE_PRIVATE_PTR.value = private_ >>> 0;
+          turboGlobals.ACTIVE_TEXTURE_PTR.value = texture >>> 0;
+          turboGlobals.ACTIVE_FRAME_SP.value = frame_sp >>> 0;
+        } catch (e) {
+          // Defensive: if the globals are immutable or not set, at least avoid crashing
+          console.warn('wasm_sync_turbo_globals failed to set globals', e);
+        }
+      },
       dispatch_uncaptured_error: (ptr, len) => {
         const mem = new Uint8Array(instance.exports.memory.buffer);
         const bytes = mem.subarray(ptr, ptr + len);
@@ -305,7 +344,7 @@ async function initWASM({ debug } = {}) {
   if (!(ex.memory instanceof WebAssembly.Memory)) {
     throw new Error('WASM module missing memory export');
   }
-  return { ex, instance, module: wasmModule, sharedTable, tableAllocator };
+  return { ex, instance, module: wasmModule, sharedTable, tableAllocator, turboGlobals };
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgl2",
-  "version": "1.2.1",
+  "version": "1.2.4",
   "description": "WebGL2 tools to derisk large GPU projects on the web beyond toys and demos.",
   "type": "module",
   "main": "index.js",
@@ -11,7 +11,6 @@
     "build-debug-distill": "cargo run --bin distill_wasm --features cli -- webgl2.debug.wasm --output webgl2.debug.wasm",
     "build-debug": "npm run build-debug-wasm-only && npm run build-debug-distill",
     "build": "npm run build-release && npm run build-debug",
-    "prepublishOnly": "npm run build",
     "test": "node --import ./test/all-coverage.js --test test/**/*.test.js test/*.test.js"
   },
   "repository": {
@@ -30,5 +29,8 @@
     "webgl2.debug.wasm",
     "*.md",
     "LICENSE"
-  ]
+  ],
+  "dependencies": {
+    "pngjs": "^7.0.0"
+  }
 }