summaryrefslogtreecommitdiff
path: root/src/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/demo_effects.h26
-rw-r--r--src/gpu/effects/gaussian_blur_effect.cc48
2 files changed, 60 insertions, 14 deletions
diff --git a/src/gpu/demo_effects.h b/src/gpu/demo_effects.h
index 36be118..6c8729d 100644
--- a/src/gpu/demo_effects.h
+++ b/src/gpu/demo_effects.h
@@ -77,12 +77,38 @@ class ParticleSprayEffect : public Effect {
GpuBuffer particles_buffer_;
};
+// Parameters for GaussianBlurEffect (set at construction time)
+struct GaussianBlurParams {
+ float strength = 2.0f; // Default: 2.0 pixel blur radius
+};
+
+// Uniform data sent to GPU shader
+struct GaussianBlurUniforms {
+ float time; // offset 0
+ float beat; // offset 4
+ float intensity; // offset 8
+ float aspect_ratio; // offset 12
+ float width; // offset 16
+ float height; // offset 20
+ float strength; // offset 24
+ float _pad; // offset 28
+};
+static_assert(sizeof(GaussianBlurUniforms) == 32,
+ "GaussianBlurUniforms must be 32 bytes for WGSL alignment");
+
class GaussianBlurEffect : public PostProcessEffect {
public:
+ // Backward compatibility constructor (uses default params)
GaussianBlurEffect(const GpuContext& ctx);
+ // New parameterized constructor
+ GaussianBlurEffect(const GpuContext& ctx, const GaussianBlurParams& params);
void render(WGPURenderPassEncoder pass, float time, float beat,
float intensity, float aspect_ratio) override;
void update_bind_group(WGPUTextureView input_view) override;
+
+ private:
+ GaussianBlurParams params_;
+ UniformBuffer<GaussianBlurUniforms> uniforms_;
};
class SolarizeEffect : public PostProcessEffect {
diff --git a/src/gpu/effects/gaussian_blur_effect.cc b/src/gpu/effects/gaussian_blur_effect.cc
index f1736bf..3975aff 100644
--- a/src/gpu/effects/gaussian_blur_effect.cc
+++ b/src/gpu/effects/gaussian_blur_effect.cc
@@ -1,26 +1,46 @@
// This file is part of the 64k demo project.
-// It implements the GaussianBlurEffect.
+// It implements the GaussianBlurEffect with parameterization.
#include "gpu/demo_effects.h"
+#include "gpu/effects/post_process_helper.h"
#include "gpu/gpu.h"
// --- GaussianBlurEffect ---
+
+// Backward compatibility constructor (delegates to parameterized constructor)
GaussianBlurEffect::GaussianBlurEffect(const GpuContext& ctx)
- : PostProcessEffect(ctx) {
- uniforms_ =
- gpu_create_buffer(ctx_.device, sizeof(float) * 6,
- WGPUBufferUsage_Uniform | WGPUBufferUsage_CopyDst);
+ : GaussianBlurEffect(ctx, GaussianBlurParams{}) {
+}
+
+// Parameterized constructor
+GaussianBlurEffect::GaussianBlurEffect(const GpuContext& ctx,
+ const GaussianBlurParams& params)
+ : PostProcessEffect(ctx), params_(params) {
pipeline_ = create_post_process_pipeline(ctx_.device, ctx_.format,
gaussian_blur_shader_wgsl);
+ uniforms_.init(ctx_.device);
}
-void GaussianBlurEffect::render(WGPURenderPassEncoder pass, float t, float b,
- float i, float a) {
- struct {
- float t, b, i, a, w, h;
- } u = {t, b, i, a, (float)width_, (float)height_};
- wgpuQueueWriteBuffer(ctx_.queue, uniforms_.buffer, 0, &u, sizeof(u));
- PostProcessEffect::render(pass, t, b, i, a);
+
+void GaussianBlurEffect::render(WGPURenderPassEncoder pass, float time,
+ float beat, float intensity,
+ float aspect_ratio) {
+ // Update uniforms with current state and parameters
+ const GaussianBlurUniforms u = {.time = time,
+ .beat = beat,
+ .intensity = intensity,
+ .aspect_ratio = aspect_ratio,
+ .width = (float)width_,
+ .height = (float)height_,
+ .strength = params_.strength,
+ ._pad = 0.0f};
+ uniforms_.update(ctx_.queue, u);
+
+ wgpuRenderPassEncoderSetPipeline(pass, pipeline_);
+ wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_, 0, nullptr);
+ wgpuRenderPassEncoderDraw(pass, 3, 1, 0, 0);
}
-void GaussianBlurEffect::update_bind_group(WGPUTextureView v) {
- pp_update_bind_group(ctx_.device, pipeline_, &bind_group_, v, uniforms_);
+
+void GaussianBlurEffect::update_bind_group(WGPUTextureView input_view) {
+ pp_update_bind_group(ctx_.device, pipeline_, &bind_group_, input_view,
+ uniforms_.get());
}