@quake2ts/test-utils 0.0.749 → 0.0.751

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quake2ts/test-utils",
-  "version": "0.0.749",
+  "version": "0.0.751",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -39,10 +39,10 @@
     "pngjs": "^7.0.0",
     "vitest": "^1.6.0",
     "webgpu": "^0.3.8",
-    "@quake2ts/engine": "^0.0.749",
-    "@quake2ts/game": "0.0.749",
-    "@quake2ts/shared": "0.0.749",
-    "@quake2ts/server": "0.0.749"
+    "@quake2ts/engine": "^0.0.751",
+    "@quake2ts/game": "0.0.751",
+    "@quake2ts/server": "0.0.751",
+    "@quake2ts/shared": "0.0.751"
   },
   "peerDependenciesMeta": {
     "@quake2ts/engine": {
@@ -92,10 +92,10 @@
     "typescript": "^5.4.5",
     "vitest": "^1.6.0",
     "webgpu": "^0.3.8",
-    "@quake2ts/engine": "^0.0.749",
-    "@quake2ts/server": "0.0.749",
-    "@quake2ts/shared": "0.0.749",
-    "@quake2ts/game": "0.0.749"
+    "@quake2ts/engine": "^0.0.751",
+    "@quake2ts/game": "0.0.751",
+    "@quake2ts/shared": "0.0.751",
+    "@quake2ts/server": "0.0.751"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/engine/helpers/webgpu-rendering.ts

@@ -7,6 +7,8 @@ export interface RenderTestSetup {
   context: WebGPUContextState;
   renderTarget: GPUTexture;
   renderTargetView: GPUTextureView;
+  depthTarget?: GPUTexture;
+  depthTargetView?: GPUTextureView;
   commandEncoder: GPUCommandEncoder;
   cleanup: () => Promise<void>;
   width: number;
@@ -19,7 +21,8 @@ export interface RenderTestSetup {
  */
 export async function createRenderTestSetup(
   width: number = 256,
-  height: number = 256
+  height: number = 256,
+  options: { depth?: boolean } = {}
 ): Promise<RenderTestSetup> {
   const setup = await initHeadlessWebGPU();
   const { device } = setup;
@@ -34,6 +37,18 @@ export async function createRenderTestSetup(
 
   const renderTargetView = renderTarget.createView();
 
+  let depthTarget: GPUTexture | undefined;
+  let depthTargetView: GPUTextureView | undefined;
+
+  if (options.depth) {
+    depthTarget = device.createTexture({
+      size: { width, height, depthOrArrayLayers: 1 },
+      format: 'depth24plus',
+      usage: GPUTextureUsage.RENDER_ATTACHMENT,
+    });
+    depthTargetView = depthTarget.createView();
+  }
+
   const commandEncoder = device.createCommandEncoder();
 
   // We need to create a context state object compatible with our engine expectations
@@ -48,11 +63,14 @@ export async function createRenderTestSetup(
     context,
     renderTarget,
     renderTargetView,
+    depthTarget,
+    depthTargetView,
     commandEncoder,
     width,
     height,
     cleanup: async () => {
         renderTarget.destroy();
+        depthTarget?.destroy();
         await setup.cleanup();
     }
   };
@@ -135,19 +153,32 @@ export async function renderAndCapture(
   renderFn: (pass: GPURenderPassEncoder) => void
 ): Promise<Uint8ClampedArray> {
   const { device, queue } = setup.context;
-  const { renderTargetView, commandEncoder, width, height } = setup;
+  const { renderTargetView, commandEncoder, width, height, depthTargetView } = setup;
+
+  const colorAttachment: GPURenderPassColorAttachment = {
+    view: renderTargetView,
+    clearValue: { r: 0, g: 0, b: 0, a: 0 },
+    loadOp: 'clear',
+    storeOp: 'store',
+  };
+
+  const descriptor: GPURenderPassDescriptor = {
+    colorAttachments: [colorAttachment],
+  };
+
+  if (depthTargetView) {
+    descriptor.depthStencilAttachment = {
+      view: depthTargetView,
+      depthClearValue: 1.0,
+      depthLoadOp: 'clear',
+      depthStoreOp: 'discard',
+    };
+  }
+
+  device.pushErrorScope('validation');
 
   // Begin render pass
-  const passEncoder = commandEncoder.beginRenderPass({
-    colorAttachments: [
-      {
-        view: renderTargetView,
-        clearValue: { r: 0, g: 0, b: 0, a: 0 },
-        loadOp: 'clear',
-        storeOp: 'store',
-      },
-    ],
-  });
+  const passEncoder = commandEncoder.beginRenderPass(descriptor);
 
   // Invoke user render function
   renderFn(passEncoder);
@@ -158,6 +189,11 @@ export async function renderAndCapture(
   // Submit the render commands
   queue.submit([commandEncoder.finish()]);
 
+  const error = await device.popErrorScope();
+  if (error) {
+    throw new Error(`WebGPU validation error: ${error.message}`);
+  }
+
   // Capture the texture (using a new encoder)
   return captureTexture(device, setup.renderTarget, width, height);
 }