1 files changed, 12 insertions, 7 deletions
diff --git a/src/gpu/effects/theme_modulation_effect.cc b/src/gpu/effects/theme_modulation_effect.cc
index f9ae636..b1eff90 100644
--- a/src/gpu/effects/theme_modulation_effect.cc
+++ b/src/gpu/effects/theme_modulation_effect.cc
@@ -6,6 +6,12 @@
 #include "gpu/effects/shaders.h"
 #include <cmath>
 
+struct ThemeModulationParams {
+  float theme_brightness;
+  float _pad[3];
+};
+static_assert(sizeof(ThemeModulationParams) == 16, "ThemeModulationParams must be 16 bytes for WGSL alignment");
+
 ThemeModulationEffect::ThemeModulationEffect(const GpuContext& ctx)
     : PostProcessEffect(ctx) {
   const char* shader_code = R"(
@@ -24,7 +30,7 @@ ThemeModulationEffect::ThemeModulationEffect(const GpuContext& ctx)
       audio_intensity: f32,
     };
 
-    struct EffectParams {
+    struct ThemeModulationParams {
       theme_brightness: f32,
       _pad0: f32,
       _pad1: f32,
@@ -34,7 +40,7 @@ ThemeModulationEffect::ThemeModulationEffect(const GpuContext& ctx)
     @group(0) @binding(0) var inputSampler: sampler;
     @group(0) @binding(1) var inputTexture: texture_2d<f32>;
     @group(0) @binding(2) var<uniform> uniforms: CommonUniforms;
-    @group(0) @binding(3) var<uniform> params: EffectParams;
+    @group(0) @binding(3) var<uniform> params: ThemeModulationParams;
 
     @vertex
     fn vs_main(@builtin(vertex_index) vertexIndex: u32) -> VertexOutput {
@@ -61,14 +67,13 @@ ThemeModulationEffect::ThemeModulationEffect(const GpuContext& ctx)
   pipeline_ =
       create_post_process_pipeline(ctx_.device, ctx_.format, shader_code);
 
-  common_uniforms_.init(ctx_.device);
   params_buffer_ = gpu_create_buffer(
       ctx_.device, 16, WGPUBufferUsage_Uniform | WGPUBufferUsage_CopyDst);
 }
 
 void ThemeModulationEffect::update_bind_group(WGPUTextureView input_view) {
   pp_update_bind_group(ctx_.device, pipeline_, &bind_group_, input_view,
-                       common_uniforms_.get(), params_buffer_);
+                       uniforms_.get(), params_buffer_);
 }
 
 void ThemeModulationEffect::render(WGPURenderPassEncoder pass, float time,
@@ -81,7 +86,7 @@ void ThemeModulationEffect::render(WGPURenderPassEncoder pass, float time,
       .beat = beat,
       .audio_intensity = intensity,
   };
-  common_uniforms_.update(ctx_.queue, u);
+  uniforms_.update(ctx_.queue, u);
 
   // Alternate between bright and dark every 4 seconds (2 pattern changes)
   // Music patterns change every 2 seconds at 120 BPM
@@ -97,8 +102,8 @@ void ThemeModulationEffect::render(WGPURenderPassEncoder pass, float time,
       bright_value + (dark_value - bright_value) * transition;
 
   // Update params buffer
-  float params[4] = {theme_brightness, 0.0f, 0.0f, 0.0f};
-  wgpuQueueWriteBuffer(ctx_.queue, params_buffer_.buffer, 0, params,
+  ThemeModulationParams params = {theme_brightness, {0.0f, 0.0f, 0.0f}};
+  wgpuQueueWriteBuffer(ctx_.queue, params_buffer_.buffer, 0, &params,
                        sizeof(params));
 
   // Render