1 files changed, 11 insertions, 50 deletions

diff --git a/src/effects/heptagon_effect.cc b/src/effects/heptagon_effect.cc
index 13d7aad..c9ec17c 100644
--- a/src/effects/heptagon_effect.cc
+++ b/src/effects/heptagon_effect.cc
@@ -10,50 +10,15 @@ Heptagon::Heptagon(const GpuContext& ctx,
                    const std::vector<std::string>& inputs,
                    const std::vector<std::string>& outputs, float start_time,
                            float end_time)
-    : Effect(ctx, inputs, outputs, start_time, end_time), pipeline_(nullptr), bind_group_(nullptr),
-      sampler_(nullptr) {
-  // Headless mode: skip GPU resource creation (compiled out in STRIP_ALL)
+    : Effect(ctx, inputs, outputs, start_time, end_time) {
   HEADLESS_RETURN_IF_NULL(ctx_.device);
 
-  // Init uniforms
-  uniforms_buffer_.init(ctx_.device);
+  init_uniforms_buffer();
+  create_nearest_sampler();
+  create_dummy_scene_texture();
 
-  // Create pipeline (standard post-process, no depth)
-  pipeline_ = create_post_process_pipeline(
-      ctx_.device, WGPUTextureFormat_RGBA8Unorm, heptagon_shader_wgsl);
-
-  // Create dummy sampler (scene effects don't use texture input)
-  WGPUSamplerDescriptor sampler_desc = {};
-  sampler_desc.addressModeU = WGPUAddressMode_ClampToEdge;
-  sampler_desc.addressModeV = WGPUAddressMode_ClampToEdge;
-  sampler_desc.magFilter = WGPUFilterMode_Nearest;
-  sampler_desc.minFilter = WGPUFilterMode_Nearest;
-  sampler_desc.maxAnisotropy = 1;
-  sampler_ = wgpuDeviceCreateSampler(ctx_.device, &sampler_desc);
-
-  // Create 1×1 dummy texture
-  WGPUTextureDescriptor tex_desc = {};
-  tex_desc.size = {1, 1, 1};
-  tex_desc.format = WGPUTextureFormat_RGBA8Unorm;
-  tex_desc.usage = WGPUTextureUsage_TextureBinding;
-  tex_desc.dimension = WGPUTextureDimension_2D;
-  tex_desc.mipLevelCount = 1;
-  tex_desc.sampleCount = 1;
-  dummy_texture_ = wgpuDeviceCreateTexture(ctx_.device, &tex_desc);
-  dummy_texture_view_ = wgpuTextureCreateView(dummy_texture_, nullptr);
-}
-
-Heptagon::~Heptagon() {
-  if (bind_group_)
-    wgpuBindGroupRelease(bind_group_);
-  if (pipeline_)
-    wgpuRenderPipelineRelease(pipeline_);
-  if (sampler_)
-    wgpuSamplerRelease(sampler_);
-  if (dummy_texture_view_)
-    wgpuTextureViewRelease(dummy_texture_view_);
-  if (dummy_texture_)
-    wgpuTextureRelease(dummy_texture_);
+  pipeline_.set(create_post_process_pipeline(
+      ctx_.device, WGPUTextureFormat_RGBA8Unorm, heptagon_shader_wgsl));
 }
 
 void Heptagon::render(WGPUCommandEncoder encoder,
@@ -66,17 +31,13 @@ void Heptagon::render(WGPUCommandEncoder encoder,
   uniforms_buffer_.update(ctx_.queue, params);
 
   // Create bind group (use dummy texture for scene effect)
-  pp_update_bind_group(ctx_.device, pipeline_, &bind_group_,
-                       dummy_texture_view_, uniforms_buffer_.get(),
+  pp_update_bind_group(ctx_.device, pipeline_.get(), bind_group_.get_address(),
+                       dummy_texture_view_.get(), uniforms_buffer_.get(),
                        {nullptr, 0});
 
   // Render pass
   WGPURenderPassColorAttachment color_attachment = {};
-  color_attachment.view = output_view;
-  color_attachment.depthSlice = WGPU_DEPTH_SLICE_UNDEFINED;
-  color_attachment.loadOp = WGPULoadOp_Clear;
-  color_attachment.storeOp = WGPUStoreOp_Store;
-  color_attachment.clearValue = {0.0, 0.0, 0.0, 1.0};
+  gpu_init_color_attachment(color_attachment, output_view);
 
   WGPURenderPassDescriptor pass_desc = {};
   pass_desc.colorAttachmentCount = 1;
@@ -84,8 +45,8 @@ void Heptagon::render(WGPUCommandEncoder encoder,
 
   WGPURenderPassEncoder pass =
       wgpuCommandEncoderBeginRenderPass(encoder, &pass_desc);
-  wgpuRenderPassEncoderSetPipeline(pass, pipeline_);
-  wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_, 0, nullptr);
+  wgpuRenderPassEncoderSetPipeline(pass, pipeline_.get());
+  wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_.get(), 0, nullptr);
   wgpuRenderPassEncoderDraw(pass, 3, 1, 0, 0); // Fullscreen triangle
   wgpuRenderPassEncoderEnd(pass);
   wgpuRenderPassEncoderRelease(pass);