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/effect.h | |
| 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/effect.h')
| -rw-r--r-- | src/gpu/effect.h | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/src/gpu/effect.h b/src/gpu/effect.h index f008c8d..7991700 100644 --- a/src/gpu/effect.h +++ b/src/gpu/effect.h @@ -22,16 +22,13 @@ class Effect { } virtual void start() { } - virtual void compute(WGPUCommandEncoder encoder, float time, float beat, - float intensity, float aspect_ratio) { + virtual void compute(WGPUCommandEncoder encoder, + const CommonPostProcessUniforms& uniforms) { (void)encoder; - (void)time; - (void)beat; - (void)intensity; - (void)aspect_ratio; + (void)uniforms; } - virtual void render(WGPURenderPassEncoder pass, float time, float beat, - float intensity, float aspect_ratio) = 0; + virtual void render(WGPURenderPassEncoder pass, + const CommonPostProcessUniforms& uniforms) = 0; virtual void resize(int width, int height) { width_ = width; height_ = height; @@ -50,6 +47,21 @@ class Effect { return false; } + // Helper: get initialized CommonPostProcessUniforms based on current dimensions + // If aspect_ratio < 0, computes from width_/height_ + CommonPostProcessUniforms get_common_uniforms(float time = 0.0f, float beat = 0.0f, + float intensity = 0.0f, + float aspect_ratio = -1.0f) const { + return { + .resolution = {static_cast<float>(width_), static_cast<float>(height_)}, + ._pad = {0.0f, 0.0f}, + .aspect_ratio = aspect_ratio < 0.0f ? static_cast<float>(width_) / static_cast<float>(height_) : aspect_ratio, + .time = time, + .beat = beat, + .audio_intensity = intensity, + }; + } + protected: const GpuContext& ctx_; UniformBuffer<CommonPostProcessUniforms> uniforms_; @@ -64,10 +76,10 @@ class PostProcessEffect : public Effect { bool is_post_process() const override { return true; } - void compute(WGPUCommandEncoder, float, float, float, float) override { + void compute(WGPUCommandEncoder, const CommonPostProcessUniforms&) override { } - void render(WGPURenderPassEncoder pass, float time, float beat, - float intensity, float aspect_ratio) override; + void render(WGPURenderPassEncoder pass, + const CommonPostProcessUniforms& uniforms) override; virtual void update_bind_group(WGPUTextureView input_view) = 0; protected: |
