1 files changed, 15 insertions, 11 deletions

diff --git a/src/gpu/effects/distort_effect.cc b/src/gpu/effects/distort_effect.cc
index d11dfd7..52a8ec7 100644
--- a/src/gpu/effects/distort_effect.cc
+++ b/src/gpu/effects/distort_effect.cc
@@ -9,31 +9,35 @@ DistortEffect::DistortEffect(const GpuContext& ctx)
     : DistortEffect(ctx, DistortParams()) {
 }
 
-DistortEffect::DistEffect(const GpuContext& ctx, const DistortParams& params)
+DistortEffect::DistortEffect(const GpuContext& ctx, const DistortParams& params)
     : PostProcessEffect(ctx), params_(params) {
-  uniforms_ =
-      gpu_create_buffer(ctx_.device, sizeof(DistortUniforms),
-                        WGPUBufferUsage_Uniform | WGPUBufferUsage_CopyDst);
+  params_buffer_.init(ctx_.device);
   pipeline_ = create_post_process_pipeline(ctx_.device, ctx_.format,
                                            distort_shader_wgsl);
 }
 
 void DistortEffect::render(WGPURenderPassEncoder pass, float t, float b,
                            float i, float a) {
-  DistortUniforms u = {
+  // Populate CommonPostProcessUniforms
+  const CommonPostProcessUniforms common_u = {
+      .resolution = {(float)width_, (float)height_},
+      .aspect_ratio = a,
       .time = t,
       .beat = b,
-      .intensity = i,
-      .aspect_ratio = a,
-      .width = (float)width_,
-      .height = (float)height_,
+      .audio_intensity = i,
+  };
+  uniforms_.update(ctx_.queue, common_u);
+
+  // Populate DistortParams
+  const DistortParams distort_p = {
       .strength = params_.strength,
       .speed = params_.speed,
   };
-  wgpuQueueWriteBuffer(ctx_.queue, uniforms_.buffer, 0, &u, sizeof(u));
+  params_buffer_.update(ctx_.queue, distort_p);
+
   PostProcessEffect::render(pass, t, b, i, a);
 }
 
 void DistortEffect::update_bind_group(WGPUTextureView v) {
-  pp_update_bind_group(ctx_.device, pipeline_, &bind_group_, v, {}, uniforms_);
+  pp_update_bind_group(ctx_.device, pipeline_, &bind_group_, v, uniforms_.get(), params_buffer_);
 }
\ No newline at end of file