webgl2 1.1.17 → 1.2.0

package/index.js

@@ -19,6 +19,30 @@ export const debug = {
 
 export { ERR_OK, ERR_INVALID_HANDLE, GPUBufferUsage, GPUMapMode, GPUTextureUsage, getShaderModule, getShaderWat, getShaderGlsl, decompileWasmToGlsl };
 
+/**
+ * Simple allocator for function table indices.
+ * Tracks which slots are in use to enable reuse.
+ */
+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;
+    this.freeList = [];
+  }
+
+  allocate() {
+    if (this.freeList.length > 0) {
+      return this.freeList.pop();
+    }
+    return this.nextIndex++;
+  }
+
+  free(index) {
+    this.freeList.push(index);
+  }
+}
+
 /**
  * WebGL2 Prototype: Rust-owned Context, JS thin-forwarder
  * Implements docs/1.1.1-webgl2-prototype.md
@@ -75,7 +99,7 @@ export async function webGL2({ debug = (typeof process !== 'undefined' ? process
       }
     });
   }
-  const { ex, instance } = await promise;
+  const { ex, instance, sharedTable, tableAllocator } = await promise;
 
   // Initialize coverage if available
   if (ex.wasm_init_coverage && ex.COV_MAP_PTR) {
@@ -105,7 +129,15 @@ export async function webGL2({ debug = (typeof process !== 'undefined' ? process
   }
 
   // Wrap and return, pass debug booleans to the JS wrapper
-  const gl = new WasmWebGL2RenderingContext({ instance, ctxHandle, width, height, debugShaders: !!debugShaders });
+  const gl = new WasmWebGL2RenderingContext({
+    instance,
+    ctxHandle,
+    width,
+    height,
+    debugShaders: !!debugShaders,
+    sharedTable,
+    tableAllocator
+  });
 
   if (size && typeof size.width === 'number' && typeof size.height === 'number') {
     gl.resize(size.width, size.height);
@@ -172,17 +204,27 @@ async function initWASM({ debug } = {}) {
 
   // Instantiate WASM (no imports needed, memory is exported)
   let instance;
+
+  // Create shared function table for direct shader calls
+  const sharedTable = new WebAssembly.Table({
+    initial: 4096,   // WASM module requires at least 1982
+    maximum: 4096,   // Prevent unbounded growth
+    element: "anyfunc"
+  });
+  const tableAllocator = new TableAllocator();
+
   const importObject = {
     env: {
+      __indirect_function_table: sharedTable,  // Exact name LLVM expects
       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, attrPtr, uniformPtr, varyingPtr, privatePtr, texturePtr) => {
+      wasm_execute_shader: (ctx, type, tableIdx, attrPtr, uniformPtr, varyingPtr, privatePtr, texturePtr) => {
         const gl = WasmWebGL2RenderingContext._contexts.get(ctx);
         if (gl) {
-          gl._executeShader(type, attrPtr, uniformPtr, varyingPtr, privatePtr, texturePtr);
+          gl._executeShader(type, tableIdx, attrPtr, uniformPtr, varyingPtr, privatePtr, texturePtr);
         } else {
           // console.log(`DEBUG: wasm_execute_shader: ctx ${ctx} not found in _contexts`);
         }
@@ -192,15 +234,29 @@ async function initWASM({ debug } = {}) {
         const bytes = mem.subarray(ptr, ptr + len);
         const msg = new TextDecoder('utf-8').decode(bytes);
         if (typeof GPU !== 'undefined' && typeof GPU.dispatchUncapturedError === 'function') {
-            GPU.dispatchUncapturedError(msg);
+          GPU.dispatchUncapturedError(msg);
         } else {
-            console.error("GPU.dispatchUncapturedError not available", msg);
+          console.error("GPU.dispatchUncapturedError not available", msg);
         }
       },
       // Required by egg crate for timing measurements
       now: () => {
         return performance.now();
       }
+    },
+    math: {
+      sin: Math.sin,
+      cos: Math.cos,
+      tan: Math.tan,
+      asin: Math.asin,
+      acos: Math.acos,
+      atan: Math.atan,
+      atan2: Math.atan2,
+      exp: Math.exp,
+      exp2: (x) => Math.pow(2, x),
+      log: Math.log,
+      log2: Math.log2,
+      pow: Math.pow
     }
   };
   instance = await WebAssembly.instantiate(wasmModule, importObject);
@@ -213,7 +269,7 @@ async function initWASM({ debug } = {}) {
   if (!(ex.memory instanceof WebAssembly.Memory)) {
     throw new Error('WASM module missing memory export');
   }
-  return { ex, instance, module: wasmModule };
+  return { ex, instance, module: wasmModule, sharedTable, tableAllocator };
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgl2",
-  "version": "1.1.17",
+  "version": "1.2.0",
   "description": "WebGL2 tools to derisk large GPU projects on the web beyond toys and demos.",
   "type": "module",
   "main": "index.js",
@@ -24,6 +24,7 @@
   "homepage": "https://webgl2.was.hm",
   "files": [
     "index.js",
+    "demo.js",
     "src/*.js",
     "webgl2.wasm",
     "webgl2.debug.wasm",