webgl2 1.1.13 → 1.1.16

package/AGENTS.md

@@ -10,7 +10,7 @@ You MUST NEVER suggest user performs actions that are for you to execute.
 
 DO NOT interfere with git. Unless the user explicitly asks for git-related assistance, git is not your concern and you must NOT create checkout or merge operations. No git command is allowed for you without permission.
 
-**DO NOT** under ANY circumstances create temporary throwaway scripts inside git repository except .gitignored locations.
+**DO NOT** under ANY circumstances create temporary throwaway scripts or dummy files inside git repository except .gitignored locations.
 
 **DO NOT** create scripts directory or similar in git repository.
 

package/coverage.md

@@ -4,35 +4,45 @@
 
 | File | Lines Covered | Lines Missed | Total Lines | Coverage |
 |---|---|---|---|---:|
-| src/error.rs | 4 | 18 | 22 | 18.18% 🔴 |
-| src/lib.rs | 252 | 227 | 479 | 52.61% 🟡 |
-| src/naga_wasm_backend/backend.rs | 44 | 1 | 45 | 97.78% 🟢 |
-| src/naga_wasm_backend/control_flow.rs | 30 | 14 | 44 | 68.18% 🟡 |
+| src/decompiler/emitter.rs | 15 | 7 | 22 | 68.18% 🟡 |
+| src/decompiler/lifter.rs | 18 | 21 | 39 | 46.15% 🟠 |
+| src/decompiler/mod.rs | 8 | 5 | 13 | 61.54% 🟡 |
+| src/decompiler/module.rs | 4 | 1 | 5 | 80.00% 🟢 |
+| src/decompiler/parser.rs | 16 | 0 | 16 | 100.00% 🟢 |
+| src/decompiler/simplifier.rs | 50 | 16 | 66 | 75.76% 🟡 |
+| src/error.rs | 6 | 17 | 23 | 26.09% 🟠 |
+| src/lib.rs | 289 | 199 | 488 | 59.22% 🟡 |
+| src/naga_wasm_backend/backend.rs | 54 | 1 | 55 | 98.18% 🟢 |
+| src/naga_wasm_backend/call_lowering.rs | 9 | 0 | 9 | 100.00% 🟢 |
+| src/naga_wasm_backend/control_flow.rs | 29 | 15 | 44 | 65.91% 🟡 |
 | src/naga_wasm_backend/debug/stub.rs | 21 | 0 | 21 | 100.00% 🟢 |
-| src/naga_wasm_backend/expressions.rs | 43 | 23 | 66 | 65.15% 🟡 |
+| src/naga_wasm_backend/expressions.rs | 55 | 16 | 71 | 77.46% 🟡 |
+| src/naga_wasm_backend/function_abi.rs | 23 | 0 | 23 | 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/output_layout.rs | 2 | 2 | 4 | 50.00% 🟡 |
-| src/naga_wasm_backend/types.rs | 6 | 1 | 7 | 85.71% 🟢 |
+| 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/webgl2_context/buffers.rs | 16 | 1 | 17 | 94.12% 🟢 |
-| src/webgl2_context/drawing.rs | 30 | 6 | 36 | 83.33% 🟢 |
+| src/webgl2_context/drawing.rs | 31 | 6 | 37 | 83.78% 🟢 |
 | src/webgl2_context/framebuffers.rs | 8 | 0 | 8 | 100.00% 🟢 |
-| src/webgl2_context/registry.rs | 6 | 1 | 7 | 85.71% 🟢 |
+| src/webgl2_context/registry.rs | 6 | 0 | 6 | 100.00% 🟢 |
 | src/webgl2_context/renderbuffers.rs | 10 | 0 | 10 | 100.00% 🟢 |
-| src/webgl2_context/shaders.rs | 87 | 15 | 102 | 85.29% 🟢 |
+| src/webgl2_context/shaders.rs | 87 | 14 | 101 | 86.14% 🟢 |
 | src/webgl2_context/state.rs | 14 | 1 | 15 | 93.33% 🟢 |
 | src/webgl2_context/textures.rs | 10 | 0 | 10 | 100.00% 🟢 |
 | src/webgl2_context/types.rs | 9 | 1 | 10 | 90.00% 🟢 |
-| src/webgl2_context/vaos.rs | 37 | 0 | 37 | 100.00% 🟢 |
-| src/webgpu/adapter.rs | 2 | 0 | 2 | 100.00% 🟢 |
+| src/webgl2_context/vaos.rs | 36 | 0 | 36 | 100.00% 🟢 |
+| src/webgpu/adapter.rs | 2 | 1 | 3 | 66.67% 🟡 |
 | src/webgpu/backend.rs | 25 | 25 | 50 | 50.00% 🟡 |
-| **Total** | **671** | **336** | **1007** | **66.63% 🟡** |
+| **Total** | **882** | **349** | **1231** | **71.65% 🟡** |
 
 ## Top Missed Files
 
 | File | Lines Missed | Illustrative Line | Coverage |
 |---|---|---|---:|
-| src/lib.rs | 227/479 | [1033] `};` | 52.61% 🟡 |
+| src/lib.rs | 199/488 | [1042] `}` | 59.22% 🟡 |
 | src/webgpu/backend.rs | 25/50 | [919] `}` | 50.00% 🟡 |
-| src/naga_wasm_backend/expressions.rs | 23/66 | [941] `let var = &ctx.module.global_variables[*handle];` | 65.15% 🟡 |
-| src/error.rs | 18/22 | [52] `pub fn set_error(source: ErrorSource, code: u32, msg: imp...` | 18.18% 🔴 |
+| src/decompiler/lifter.rs | 21/39 | [455] `fn unary_op(&mut self, op: UnaryOp) {` | 46.15% 🟠 |
+| src/error.rs | 17/23 | [52] `pub fn set_error(source: ErrorSource, code: u32, msg: imp...` | 26.09% 🟠 |

package/index.js

@@ -6,7 +6,9 @@ import {
   ERR_INVALID_HANDLE,
   readErrorMessage,
   getShaderModule,
-  getShaderWat
+  getShaderWat,
+  getShaderGlsl,
+  decompileWasmToGlsl
 } from './src/webgl2_context.js';
 import { GPU, GPUBufferUsage, GPUMapMode, GPUTextureUsage } from './src/webgpu_context.js';
 
@@ -15,7 +17,7 @@ export const debug = {
   resetLcovReport
 };
 
-export { ERR_OK, ERR_INVALID_HANDLE, GPUBufferUsage, GPUMapMode, GPUTextureUsage, getShaderModule, getShaderWat };
+export { ERR_OK, ERR_INVALID_HANDLE, GPUBufferUsage, GPUMapMode, GPUTextureUsage, getShaderModule, getShaderWat, getShaderGlsl, decompileWasmToGlsl };
 
 /**
  * WebGL2 Prototype: Rust-owned Context, JS thin-forwarder
@@ -194,6 +196,10 @@ async function initWASM({ debug } = {}) {
         } else {
             console.error("GPU.dispatchUncapturedError not available", msg);
         }
+      },
+      // Required by egg crate for timing measurements
+      now: () => {
+        return performance.now();
       }
     }
   };

package/package.json

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

@@ -155,14 +155,8 @@ export class WasmWebGL2RenderingContext {
     }
     const shaderInstance = type === this.VERTEX_SHADER ? this._currentProgram._vsInstance : this._currentProgram._fsInstance;
     if (shaderInstance && shaderInstance.exports.main) {
-      try {
-        // @ts-ignore
-        shaderInstance.exports.main(type, attrPtr, uniformPtr, varyingPtr, privatePtr, texturePtr);
-      } catch (e) {
-        console.error(`Shader execution error in ${type === this.VERTEX_SHADER ? 'VS' : 'FS'}:`, e);
-        console.error(`  attrPtr: ${attrPtr}, uniformPtr: ${uniformPtr}, varyingPtr: ${varyingPtr}, privatePtr: ${privatePtr}, texturePtr: ${texturePtr}`);
-        throw e;
-      }
+      // @ts-ignore
+      shaderInstance.exports.main(type, attrPtr, uniformPtr, varyingPtr, privatePtr, texturePtr);
     }
   }
 
@@ -220,6 +214,11 @@ export class WasmWebGL2RenderingContext {
     const handle = tex && typeof tex === 'object' && typeof tex._handle === 'number' ? tex._handle : (tex >>> 0);
     const code = ex.wasm_ctx_bind_texture(this._ctxHandle, target >>> 0, handle);
     _checkErr(code, this._instance);
+    // Record bound texture in JS so we can map units to texture data for texel fetch
+    this._boundTexture = handle;
+    this._textureUnits = this._textureUnits || [];
+    const unit = this._activeTextureUnit || 0;
+    this._textureUnits[unit] = handle;
   }
 
   texImage2D(target, level, internalFormat, width, height, border, format, type_, pixels) {
@@ -255,6 +254,12 @@ export class WasmWebGL2RenderingContext {
         len >>> 0
       );
       _checkErr(code, this._instance);
+
+      // Mirror texture data in JS for fast texel fetches by shader imports
+      this._textureData = this._textureData || new Map();
+      const handle = this._boundTexture || 0;
+      const copy = new Uint8Array(mem.slice(ptr, ptr + len));
+      this._textureData.set(handle, { width: width >>> 0, height: height >>> 0, data: copy });
     } finally {
       ex.wasm_free(ptr);
     }
@@ -576,10 +581,12 @@ export class WasmWebGL2RenderingContext {
       };
     };
 
-    const vsModule = new WebAssembly.Module(vsWasm);
+    let vsModule;
+    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,
@@ -588,10 +595,12 @@ export class WasmWebGL2RenderingContext {
     });
     vsInstanceRef.current = program._vsInstance;
 
-    const fsModule = new WebAssembly.Module(fsWasm);
+    let fsModule;
+    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,
@@ -1223,6 +1232,9 @@ export class WasmWebGL2RenderingContext {
     }
     const code = ex.wasm_ctx_active_texture(this._ctxHandle, texture >>> 0);
     _checkErr(code, this._instance);
+    // Track active texture unit in JS wrapper (GL_TEXTURE0 = 0x84C0)
+    this._activeTextureUnit = (texture >>> 0) - 0x84C0;
+    this._textureUnits = this._textureUnits || [];
   }
   texParameteri(target, pname, param) {
     this._assertNotDestroyed();
@@ -1682,3 +1694,124 @@ export function getShaderWat(ctxHandle, programHandle, shaderType) {
 
   return watText;
 }
+
+/**
+ * Decompile WASM bytes to GLSL source code.
+ * 
+ * This uses the WASM-to-GLSL decompiler to convert compiled shader WASM
+ * back into readable GLSL-like code.
+ * 
+ * @param {number} ctxHandle - Context handle
+ * @param {number} programHandle - Program handle
+ * @param {number} shaderType - Shader type (VERTEX_SHADER or FRAGMENT_SHADER)
+ * @returns {string | null} GLSL source code or null if not available
+ */
+export function getShaderGlsl(ctxHandle, programHandle, shaderType) {
+  const ctx = WasmWebGL2RenderingContext._contexts.get(ctxHandle);
+  if (!ctx) {
+    throw new Error('Invalid context handle');
+  }
+
+  // First get the WASM bytes for the shader
+  const wasmBytes = getShaderModule(ctxHandle, programHandle, shaderType);
+  if (!wasmBytes) {
+    return null;
+  }
+
+  const ex = ctx._instance.exports;
+  if (!ex || typeof ex.wasm_decompile_to_glsl !== 'function') {
+    throw new Error('wasm_decompile_to_glsl not found');
+  }
+
+  // Allocate memory in WASM for the input bytes
+  const wasmBytesLen = wasmBytes.length;
+  const wasmBytesPtr = ex.wasm_alloc(wasmBytesLen);
+  if (wasmBytesPtr === 0) {
+    throw new Error('Failed to allocate memory for WASM bytes');
+  }
+
+  try {
+    // Copy WASM bytes to linear memory
+    const mem = new Uint8Array(ex.memory.buffer);
+    mem.set(wasmBytes, wasmBytesPtr);
+
+    // Call the decompiler
+    const resultLen = ex.wasm_decompile_to_glsl(wasmBytesPtr, wasmBytesLen);
+
+    if (resultLen === 0) {
+      return null;
+    }
+
+    // Get the decompiled GLSL
+    const glslPtr = ex.wasm_get_decompiled_glsl_ptr();
+    const glslLen = ex.wasm_get_decompiled_glsl_len();
+
+    if (glslPtr === 0 || glslLen === 0) {
+      return null;
+    }
+
+    // Read the GLSL string
+    const glslBytes = new Uint8Array(ex.memory.buffer).subarray(glslPtr, glslPtr + glslLen);
+    const decoder = new TextDecoder('utf-8');
+    return decoder.decode(glslBytes);
+  } finally {
+    // Free the allocated memory
+    ex.wasm_free(wasmBytesPtr);
+  }
+}
+
+/**
+ * Decompile raw WASM bytes to GLSL source code.
+ * 
+ * This is a lower-level API that takes raw WASM bytes directly.
+ * 
+ * @param {WasmWebGL2RenderingContext} gl - WebGL2 context
+ * @param {Uint8Array} wasmBytes - Raw WASM bytecode to decompile
+ * @returns {string | null} GLSL source code or null on error
+ */
+export function decompileWasmToGlsl(gl, wasmBytes) {
+  if (!gl || !gl._instance) {
+    throw new Error('Invalid WebGL2 context');
+  }
+
+  const ex = gl._instance.exports;
+  if (!ex || typeof ex.wasm_decompile_to_glsl !== 'function') {
+    throw new Error('wasm_decompile_to_glsl not found');
+  }
+
+  // Allocate memory in WASM for the input bytes
+  const wasmBytesLen = wasmBytes.length;
+  const wasmBytesPtr = ex.wasm_alloc(wasmBytesLen);
+  if (wasmBytesPtr === 0) {
+    throw new Error('Failed to allocate memory for WASM bytes');
+  }
+
+  try {
+    // Copy WASM bytes to linear memory
+    const mem = new Uint8Array(ex.memory.buffer);
+    mem.set(wasmBytes, wasmBytesPtr);
+
+    // Call the decompiler
+    const resultLen = ex.wasm_decompile_to_glsl(wasmBytesPtr, wasmBytesLen);
+
+    if (resultLen === 0) {
+      return null;
+    }
+
+    // Get the decompiled GLSL
+    const glslPtr = ex.wasm_get_decompiled_glsl_ptr();
+    const glslLen = ex.wasm_get_decompiled_glsl_len();
+
+    if (glslPtr === 0 || glslLen === 0) {
+      return null;
+    }
+
+    // Read the GLSL string
+    const glslBytes = new Uint8Array(ex.memory.buffer).subarray(glslPtr, glslPtr + glslLen);
+    const decoder = new TextDecoder('utf-8');
+    return decoder.decode(glslBytes);
+  } finally {
+    // Free the allocated memory
+    ex.wasm_free(wasmBytesPtr);
+  }
+}