1 files changed, 22 insertions, 11 deletions
diff --git a/src/gpu/effects/circle_mask_effect.cc b/src/gpu/effects/circle_mask_effect.cc
index 55bcb90..226b603 100644
--- a/src/gpu/effects/circle_mask_effect.cc
+++ b/src/gpu/effects/circle_mask_effect.cc
@@ -51,7 +51,7 @@ void CircleMaskEffect::init(MainSequence* demo) {
   WGPUShaderModule compute_module = wgpuDeviceCreateShaderModule(ctx_.device, &compute_desc);
 
   const WGPUColorTargetState compute_target = {
-    .format = WGPUTextureFormat_RGBA8Unorm,
+    .format = ctx_.format,  // Match auxiliary texture format
     .writeMask = WGPUColorWriteMask_All,
   };
   WGPUFragmentState compute_frag = {};
@@ -60,6 +60,7 @@ void CircleMaskEffect::init(MainSequence* demo) {
   compute_frag.targetCount = 1;
   compute_frag.targets = &compute_target;
   WGPURenderPipelineDescriptor compute_pipeline_desc = {};
+  compute_pipeline_desc.label = label_view("CircleMaskEffect_compute");
   compute_pipeline_desc.vertex.module = compute_module;
   compute_pipeline_desc.vertex.entryPoint = str_view("vs_main");
   compute_pipeline_desc.primitive.topology = WGPUPrimitiveTopology_TriangleList;
@@ -98,11 +99,19 @@ void CircleMaskEffect::init(MainSequence* demo) {
   render_frag.entryPoint = str_view("fs_main");
   render_frag.targetCount = 1;
   render_frag.targets = &render_target;
+  const WGPUDepthStencilState depth_stencil = {
+    .format = WGPUTextureFormat_Depth24Plus,
+    .depthWriteEnabled = WGPUOptionalBool_False,  // Don't write depth
+    .depthCompare = WGPUCompareFunction_Always,   // Always pass
+  };
+
   WGPURenderPipelineDescriptor render_pipeline_desc = {};
+  render_pipeline_desc.label = label_view("CircleMaskEffect_render");
   render_pipeline_desc.vertex.module = render_module;
   render_pipeline_desc.vertex.entryPoint = str_view("vs_main");
   render_pipeline_desc.primitive.topology = WGPUPrimitiveTopology_TriangleList;
   render_pipeline_desc.primitive.cullMode = WGPUCullMode_None;
+  render_pipeline_desc.depthStencil = &depth_stencil;
   render_pipeline_desc.multisample.count = 1;
   render_pipeline_desc.multisample.mask = 0xFFFFFFFF;
   render_pipeline_desc.fragment = &render_frag;
@@ -139,16 +148,18 @@ void CircleMaskEffect::compute(WGPUCommandEncoder encoder, float time,
   compute_uniforms_.update(ctx_.queue, uniforms);
 
   WGPUTextureView mask_view = demo_->get_auxiliary_view("circle_mask");
-  const WGPURenderPassColorAttachment color_attachment = {
-    .view = mask_view,
-    .loadOp = WGPULoadOp_Clear,
-    .storeOp = WGPUStoreOp_Store,
-    .clearValue = {0.0, 0.0, 0.0, 1.0},
-  };
-  const WGPURenderPassDescriptor pass_desc = {
-    .colorAttachmentCount = 1,
-    .colorAttachments = &color_attachment,
-  };
+  WGPURenderPassColorAttachment color_attachment = {};
+  color_attachment.view = mask_view;
+  color_attachment.loadOp = WGPULoadOp_Clear;
+  color_attachment.storeOp = WGPUStoreOp_Store;
+  color_attachment.clearValue = {0.0, 0.0, 0.0, 1.0};
+#if !defined(DEMO_CROSS_COMPILE_WIN32)
+  color_attachment.depthSlice = WGPU_DEPTH_SLICE_UNDEFINED;
+#endif
+
+  WGPURenderPassDescriptor pass_desc = {};
+  pass_desc.colorAttachmentCount = 1;
+  pass_desc.colorAttachments = &color_attachment;
 
   WGPURenderPassEncoder pass = wgpuCommandEncoderBeginRenderPass(encoder, &pass_desc);
   wgpuRenderPassEncoderSetPipeline(pass, compute_pipeline_);