1 files changed, 12 insertions, 9 deletions
diff --git a/src/gpu/effects/particles_effect.cc b/src/gpu/effects/particles_effect.cc
index f25009b..01f90a5 100644
--- a/src/gpu/effects/particles_effect.cc
+++ b/src/gpu/effects/particles_effect.cc
@@ -2,26 +2,25 @@
 // It implements the ParticlesEffect.
 
 #include "gpu/demo_effects.h"
+#include "gpu/effects/post_process_helper.h"
 #include "gpu/gpu.h"
 #include <vector>
 
 // --- ParticlesEffect ---
 ParticlesEffect::ParticlesEffect(const GpuContext& ctx) : Effect(ctx) {
-  uniforms_ =
-      gpu_create_buffer(ctx_.device, sizeof(float) * 4,
-                        WGPUBufferUsage_Uniform | WGPUBufferUsage_CopyDst);
+  uniforms_.init(ctx_.device);
   std::vector<Particle> init_p(NUM_PARTICLES);
   particles_buffer_ = gpu_create_buffer(
       ctx_.device, sizeof(Particle) * NUM_PARTICLES,
       WGPUBufferUsage_Storage | WGPUBufferUsage_Vertex, init_p.data());
   ResourceBinding cb[] = {{particles_buffer_, WGPUBufferBindingType_Storage},
-                          {uniforms_, WGPUBufferBindingType_Uniform}};
+                          {uniforms_.get(), WGPUBufferBindingType_Uniform}};
   compute_pass_ =
       gpu_create_compute_pass(ctx_.device, particle_compute_wgsl, cb, 2);
   compute_pass_.workgroup_size_x = (NUM_PARTICLES + 63) / 64;
   ResourceBinding rb[] = {
       {particles_buffer_, WGPUBufferBindingType_ReadOnlyStorage},
-      {uniforms_, WGPUBufferBindingType_Uniform}};
+      {uniforms_.get(), WGPUBufferBindingType_Uniform}};
   render_pass_ = gpu_create_render_pass(ctx_.device, ctx_.format,
                                         particle_render_wgsl, rb, 2);
   render_pass_.vertex_count = 6;
@@ -29,10 +28,14 @@ ParticlesEffect::ParticlesEffect(const GpuContext& ctx) : Effect(ctx) {
 }
 void ParticlesEffect::compute(WGPUCommandEncoder e, float t, float b, float i,
                               float a) {
-  struct {
-    float p, a, t, d;
-  } u = {i, a, t, 0.0f};
-  wgpuQueueWriteBuffer(ctx_.queue, uniforms_.buffer, 0, &u, sizeof(u));
+  const CommonPostProcessUniforms u = {
+      .resolution = {(float)width_, (float)height_},
+      .aspect_ratio = a,
+      .time = t,
+      .beat = b,
+      .audio_intensity = i,
+  };
+  uniforms_.update(ctx_.queue, u);
   WGPUComputePassEncoder pass = wgpuCommandEncoderBeginComputePass(e, nullptr);
   wgpuComputePassEncoderSetPipeline(pass, compute_pass_.pipeline);
   wgpuComputePassEncoderSetBindGroup(pass, 0, compute_pass_.bind_group, 0,