diff options
| author | skal <pascal.massimino@gmail.com> | 2026-02-11 11:34:08 +0100 |
|---|---|---|
| committer | skal <pascal.massimino@gmail.com> | 2026-02-11 11:34:08 +0100 |
| commit | d378da77eec4d506bc01e4c08c38644d72969cc7 (patch) | |
| tree | 5cc38517320ba3aefb46a2f9c939c9fdc8ed5fae /src/gpu/effects/circle_mask_effect.cc | |
| parent | 4da0a3a5369142078fd7c681e3f0f1817bd6e2f3 (diff) | |
refactor: Simplify effect render API and fix uniform initialization
Root cause: Uniform buffers created but not initialized before bind group
creation, causing undefined UV coordinates in circle_mask_compute.wgsl.
Changes:
- Add get_common_uniforms() helper to Effect base class
- Refactor render()/compute() signatures: 5 params → CommonPostProcessUniforms&
- Fix uninitialized uniforms in CircleMaskEffect and CNNEffect
- Update all 19 effect implementations and headers
- Fix WGSL syntax error in FlashEffect (u.audio_intensity → audio_intensity)
- Update test files (test_sequence.cc)
Benefits:
- Cleaner API: construct uniforms once per frame, reuse across effects
- More maintainable: CommonPostProcessUniforms changes need no call site updates
- Fixes UV coordinate bug in circle_mask_compute.wgsl
All 36 tests passing (100%)
handoff(Claude): Effect API refactor complete
Diffstat (limited to 'src/gpu/effects/circle_mask_effect.cc')
| -rw-r--r-- | src/gpu/effects/circle_mask_effect.cc | 26 |
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_); |
