1 files changed, 7 insertions, 19 deletions
diff --git a/src/gpu/effects/circle_mask_effect.cc b/src/gpu/effects/circle_mask_effect.cc
index ca80cf9..d2645d6 100644
--- a/src/gpu/effects/circle_mask_effect.cc
+++ b/src/gpu/effects/circle_mask_effect.cc
@@ -33,6 +33,9 @@ void CircleMaskEffect::init(MainSequence* demo) {
 
   compute_params_.init(ctx_.device);
 
+  // Initialize uniforms BEFORE bind group creation
+  uniforms_.update(ctx_.queue, get_common_uniforms());
+
   WGPUSamplerDescriptor sampler_desc = {};
   sampler_desc.addressModeU = WGPUAddressMode_ClampToEdge;
   sampler_desc.addressModeV = WGPUAddressMode_ClampToEdge;
@@ -154,16 +157,8 @@ void CircleMaskEffect::init(MainSequence* demo) {
   render_bind_group_ = wgpuDeviceCreateBindGroup(ctx_.device, &render_bg_desc);
 }
 
-void CircleMaskEffect::compute(WGPUCommandEncoder encoder, float time,
-                               float beat, float intensity,
-                               float aspect_ratio) {
-  const CommonPostProcessUniforms uniforms = {
-      .resolution = {static_cast<float>(width_), static_cast<float>(height_)},
-      .aspect_ratio = aspect_ratio,
-      .time = time,
-      .beat = beat,
-      .audio_intensity = intensity,
-  };
+void CircleMaskEffect::compute(WGPUCommandEncoder encoder,
+                               const CommonPostProcessUniforms& uniforms) {
   uniforms_.update(ctx_.queue, uniforms);
 
   const CircleMaskParams params = {
@@ -194,15 +189,8 @@ void CircleMaskEffect::compute(WGPUCommandEncoder encoder, float time,
   wgpuRenderPassEncoderRelease(pass);
 }
 
-void CircleMaskEffect::render(WGPURenderPassEncoder pass, float time,
-                              float beat, float intensity, float aspect_ratio) {
-  const CommonPostProcessUniforms uniforms = {
-      .resolution = {static_cast<float>(width_), static_cast<float>(height_)},
-      .aspect_ratio = aspect_ratio,
-      .time = time,
-      .beat = beat,
-      .audio_intensity = intensity,
-  };
+void CircleMaskEffect::render(WGPURenderPassEncoder pass,
+                              const CommonPostProcessUniforms& uniforms) {
   uniforms_.update(ctx_.queue, uniforms);
 
   wgpuRenderPassEncoderSetPipeline(pass, render_pipeline_);