summaryrefslogtreecommitdiff
path: root/src/effects
diff options
context:
space:
mode:
Diffstat (limited to 'src/effects')
-rw-r--r--src/effects/cnn_effect.cc129
-rw-r--r--src/effects/cnn_effect.h53
-rw-r--r--src/effects/cnn_v2_effect.cc497
-rw-r--r--src/effects/cnn_v2_effect.h89
-rw-r--r--src/effects/flash_cube_effect.cc6
-rw-r--r--src/effects/gaussian_blur_effect.h4
-rw-r--r--src/effects/particle_spray_effect.h2
-rw-r--r--src/effects/particles_effect.h2
-rw-r--r--src/effects/sdf_test_effect.cc4
9 files changed, 9 insertions, 777 deletions
diff --git a/src/effects/cnn_effect.cc b/src/effects/cnn_effect.cc
deleted file mode 100644
index 49c5239..0000000
--- a/src/effects/cnn_effect.cc
+++ /dev/null
@@ -1,129 +0,0 @@
-// CNN post-processing effect implementation
-// Neural network-based stylization with modular WGSL
-
-#include "effects/cnn_effect.h"
-#include "gpu/bind_group_builder.h"
-#include "gpu/effect.h"
-#include "gpu/pipeline_builder.h"
-#include "gpu/post_process_helper.h"
-#include "gpu/sampler_cache.h"
-#include "gpu/shader_composer.h"
-#include "gpu/shaders.h"
-
-// Create custom pipeline with 5 bindings (includes original texture)
-static WGPURenderPipeline create_cnn_pipeline(WGPUDevice device,
- WGPUTextureFormat format,
- const char* shader_code) {
- WGPUBindGroupLayout bgl =
- BindGroupLayoutBuilder()
- .sampler(0, WGPUShaderStage_Fragment)
- .texture(1, WGPUShaderStage_Fragment)
- .uniform(2, WGPUShaderStage_Vertex | WGPUShaderStage_Fragment)
- .uniform(3, WGPUShaderStage_Fragment)
- .texture(4, WGPUShaderStage_Fragment)
- .build(device);
-
- WGPURenderPipeline pipeline = RenderPipelineBuilder(device)
- .shader(shader_code)
- .bind_group_layout(bgl)
- .format(format)
- .build();
-
- wgpuBindGroupLayoutRelease(bgl);
- return pipeline;
-}
-
-CNNEffect::CNNEffect(const GpuContext& ctx)
- : PostProcessEffect(ctx), layer_index_(0), total_layers_(1),
- blend_amount_(1.0f), input_view_(nullptr), original_view_(nullptr),
- bind_group_(nullptr) {
- pipeline_ =
- create_cnn_pipeline(ctx_.device, ctx_.format, cnn_layer_shader_wgsl);
-}
-
-CNNEffect::CNNEffect(const GpuContext& ctx, const CNNEffectParams& params)
- : PostProcessEffect(ctx), layer_index_(params.layer_index),
- total_layers_(params.total_layers), blend_amount_(params.blend_amount),
- input_view_(nullptr), original_view_(nullptr), bind_group_(nullptr) {
- pipeline_ =
- create_cnn_pipeline(ctx_.device, ctx_.format, cnn_layer_shader_wgsl);
-}
-
-void CNNEffect::init(MainSequence* demo) {
- PostProcessEffect::init(demo);
- demo_ = demo;
- params_buffer_.init(ctx_.device);
-
- // Register auxiliary texture for layer 0 (width_/height_ set by resize())
- if (layer_index_ == 0) {
- demo_->register_auxiliary_texture("captured_frame", width_, height_);
- }
-
- // Initialize uniforms BEFORE any bind group creation
- uniforms_.update(ctx_.queue, get_common_uniforms());
-
- CNNLayerParams params = {layer_index_, blend_amount_, {0.0f, 0.0f}};
- params_buffer_.update(ctx_.queue, params);
-}
-
-void CNNEffect::resize(int width, int height) {
- if (width == width_ && height == height_)
- return;
-
- PostProcessEffect::resize(width, height);
-
- // Only layer 0 owns the captured_frame texture
- if (layer_index_ == 0 && demo_) {
- demo_->resize_auxiliary_texture("captured_frame", width, height);
- }
-}
-
-void CNNEffect::render(WGPURenderPassEncoder pass,
- const CommonPostProcessUniforms& uniforms) {
- if (!bind_group_) {
- fprintf(stderr, "CNN render: no bind_group\n");
- return;
- }
-
- float effective_blend = blend_amount_;
- if (beat_modulated_) {
- effective_blend = blend_amount_ * uniforms.beat_phase * beat_scale_;
- }
-
- CNNLayerParams params = {layer_index_, effective_blend, {0.0f, 0.0f}};
- params_buffer_.update(ctx_.queue, params);
-
- wgpuRenderPassEncoderSetPipeline(pass, pipeline_);
- wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_, 0, nullptr);
- wgpuRenderPassEncoderDraw(pass, 3, 1, 0, 0);
-}
-
-void CNNEffect::update_bind_group(WGPUTextureView input_view) {
- input_view_ = input_view;
-
- // Update common uniforms (CRITICAL for UV calculation!)
- uniforms_.update(ctx_.queue, get_common_uniforms());
-
- // All layers: get captured frame (original input from layer 0)
- if (demo_) {
- original_view_ = demo_->get_auxiliary_view("captured_frame");
- }
-
- // Create bind group with original texture
- if (bind_group_)
- wgpuBindGroupRelease(bind_group_);
-
- WGPUBindGroupLayout bgl = wgpuRenderPipelineGetBindGroupLayout(pipeline_, 0);
- // Use clamp (not repeat) to match PyTorch Conv2d zero-padding behavior
- WGPUSampler sampler =
- SamplerCache::Get().get_or_create(ctx_.device, SamplerCache::clamp());
-
- bind_group_ =
- BindGroupBuilder()
- .sampler(0, sampler)
- .texture(1, input_view_)
- .buffer(2, uniforms_.get().buffer, uniforms_.get().size)
- .buffer(3, params_buffer_.get().buffer, params_buffer_.get().size)
- .texture(4, original_view_ ? original_view_ : input_view_)
- .build(ctx_.device, bgl);
-}
diff --git a/src/effects/cnn_effect.h b/src/effects/cnn_effect.h
deleted file mode 100644
index cdcd656..0000000
--- a/src/effects/cnn_effect.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// CNN post-processing effect header
-// Multi-layer neural network stylization
-
-#pragma once
-#include "gpu/effect.h"
-#include "gpu/uniform_helper.h"
-
-struct CNNLayerParams {
- int layer_index;
- float blend_amount; // Blend: mix(input, output, blend_amount)
- float _pad[2];
-};
-static_assert(sizeof(CNNLayerParams) == 16);
-
-struct CNNEffectParams {
- int layer_index = 0; // Which layer to render (0-based)
- int total_layers = 1; // Total number of layers in the CNN
- float blend_amount = 1.0f; // Final blend with original input
-};
-
-class CNNEffect : public PostProcessEffect {
- public:
- explicit CNNEffect(const GpuContext& ctx);
- explicit CNNEffect(const GpuContext& ctx, const CNNEffectParams& params);
-
- void init(MainSequence* demo) override;
- void resize(int width, int height) override;
- void render(WGPURenderPassEncoder pass,
- const CommonPostProcessUniforms& uniforms) override;
- void update_bind_group(WGPUTextureView input_view) override;
-
- // Layer 0 needs framebuffer capture for original input
- bool needs_framebuffer_capture() const override {
- return layer_index_ == 0;
- }
-
- void set_beat_modulation(bool enabled, float scale = 1.0f) {
- beat_modulated_ = enabled;
- beat_scale_ = scale;
- }
-
- private:
- int layer_index_;
- int total_layers_;
- float blend_amount_;
- bool beat_modulated_ = false;
- float beat_scale_ = 1.0f;
- WGPUTextureView input_view_;
- WGPUTextureView original_view_;
- UniformBuffer<CNNLayerParams> params_buffer_;
- WGPUBindGroup bind_group_;
- MainSequence* demo_ = nullptr;
-};
diff --git a/src/effects/cnn_v2_effect.cc b/src/effects/cnn_v2_effect.cc
deleted file mode 100644
index 7127aae..0000000
--- a/src/effects/cnn_v2_effect.cc
+++ /dev/null
@@ -1,497 +0,0 @@
-// CNN v2 Effect Implementation
-
-#include "effects/cnn_v2_effect.h"
-
-#if defined(USE_TEST_ASSETS)
-#include "test_assets.h"
-#else
-#include "generated/assets.h"
-#endif
-
-#include "gpu/bind_group_builder.h"
-#include "gpu/gpu.h"
-#include "util/asset_manager.h"
-#include "util/fatal_error.h"
-#include <cstring>
-
-CNNv2Effect::CNNv2Effect(const GpuContext& ctx)
- : PostProcessEffect(ctx), static_pipeline_(nullptr),
- static_bind_group_(nullptr), static_params_buffer_(nullptr),
- static_features_tex_(nullptr), static_features_view_(nullptr),
- linear_sampler_(nullptr), layer_pipeline_(nullptr),
- weights_buffer_(nullptr), input_mip_tex_(nullptr),
- current_input_view_(nullptr), blend_amount_(1.0f), mip_level_(0),
- initialized_(false) {
- std::memset(input_mip_view_, 0, sizeof(input_mip_view_));
-}
-
-CNNv2Effect::CNNv2Effect(const GpuContext& ctx, const CNNv2EffectParams& params)
- : PostProcessEffect(ctx), static_pipeline_(nullptr),
- static_bind_group_(nullptr), static_params_buffer_(nullptr),
- static_features_tex_(nullptr), static_features_view_(nullptr),
- linear_sampler_(nullptr), layer_pipeline_(nullptr),
- weights_buffer_(nullptr), input_mip_tex_(nullptr),
- current_input_view_(nullptr), blend_amount_(params.blend_amount),
- mip_level_(0), initialized_(false) {
- std::memset(input_mip_view_, 0, sizeof(input_mip_view_));
-}
-
-CNNv2Effect::~CNNv2Effect() {
- cleanup();
-}
-
-void CNNv2Effect::init(MainSequence* demo) {
- (void)demo;
- if (initialized_)
- return;
-
- load_weights();
- create_textures();
- create_pipelines();
-
- initialized_ = true;
-}
-
-void CNNv2Effect::resize(int width, int height) {
- PostProcessEffect::resize(width, height);
- cleanup();
- create_textures();
- create_pipelines();
-}
-
-void CNNv2Effect::load_weights() {
- // Load binary weights asset
- size_t weights_size = 0;
- const uint8_t* weights_data =
- (const uint8_t*)GetAsset(AssetId::ASSET_WEIGHTS_CNN_V2, &weights_size);
-
- if (!weights_data || weights_size < 20) {
- // Weights not available - effect will skip
- return;
- }
-
- // Parse header
- const uint32_t* header = (const uint32_t*)weights_data;
- uint32_t magic = header[0];
- uint32_t version = header[1];
- uint32_t num_layers = header[2];
- uint32_t total_weights = header[3];
-
- FATAL_CHECK(magic != 0x324e4e43, "Invalid CNN v2 weights magic\n"); // 'CNN2'
-
- // Support both version 1 (16-byte header) and version 2 (20-byte header with
- // mip_level)
- // TODO: Version 3 should include feature descriptor for arbitrary
- // layout/ordering
- if (version == 1) {
- mip_level_ = 0; // Default for v1
- } else if (version == 2) {
- mip_level_ = header[4];
- } else {
- FATAL_ERROR("Unsupported CNN v2 weights version: %u\n", version);
- }
-
- // Parse layer info (20 bytes per layer)
- // Offset depends on version: v1=16 bytes (4 u32), v2=20 bytes (5 u32)
- const uint32_t header_u32_count = (version == 1) ? 4 : 5;
- const uint32_t* layer_data = header + header_u32_count;
- for (uint32_t i = 0; i < num_layers; ++i) {
- LayerInfo info;
- info.kernel_size = layer_data[i * 5 + 0];
- info.in_channels = layer_data[i * 5 + 1];
- info.out_channels = layer_data[i * 5 + 2];
- info.weight_offset = layer_data[i * 5 + 3];
- info.weight_count = layer_data[i * 5 + 4];
- layer_info_.push_back(info);
- }
-
- // Create GPU storage buffer for weights (skip header + layer info, upload
- // only weights)
- size_t header_size = 20; // 5 u32
- size_t layer_info_size = 20 * num_layers; // 5 u32 per layer
- size_t weights_offset = header_size + layer_info_size;
- size_t weights_only_size = weights_size - weights_offset;
-
- WGPUBufferDescriptor buffer_desc = {};
- buffer_desc.size = weights_only_size;
- buffer_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst;
- buffer_desc.mappedAtCreation = false;
-
- weights_buffer_ = wgpuDeviceCreateBuffer(ctx_.device, &buffer_desc);
-
- // Upload only weights (skip header + layer info)
- wgpuQueueWriteBuffer(ctx_.queue, weights_buffer_, 0,
- weights_data + weights_offset, weights_only_size);
-
- // Create uniform buffers for layer params (one per layer)
- for (uint32_t i = 0; i < num_layers; ++i) {
- WGPUBufferDescriptor params_desc = {};
- params_desc.size = sizeof(LayerParams);
- params_desc.usage = WGPUBufferUsage_Uniform | WGPUBufferUsage_CopyDst;
- params_desc.mappedAtCreation = false;
-
- WGPUBuffer buf = wgpuDeviceCreateBuffer(ctx_.device, &params_desc);
- layer_params_buffers_.push_back(buf);
- }
-}
-
-void CNNv2Effect::create_textures() {
- // Static features texture (8×f16 packed as 4×u32)
- TextureWithView static_tex = gpu_create_storage_texture_2d(
- ctx_.device, width_, height_, WGPUTextureFormat_RGBA32Uint);
- static_features_tex_ = static_tex.texture;
- static_features_view_ = static_tex.view;
-
- // Input texture with mips (for multi-scale features)
- TextureWithView input_mip = gpu_create_texture_2d(
- ctx_.device, width_, height_, WGPUTextureFormat_RGBA8Unorm,
- (WGPUTextureUsage)(WGPUTextureUsage_TextureBinding |
- WGPUTextureUsage_CopyDst),
- 3);
- input_mip_tex_ = input_mip.texture;
-
- for (int i = 0; i < 3; ++i) {
- input_mip_view_[i] =
- gpu_create_mip_view(input_mip_tex_, WGPUTextureFormat_RGBA8Unorm, i);
- }
-
- // Create 2 layer textures (ping-pong buffers for intermediate results)
- // Each stores 8×f16 channels packed as 4×u32
- for (int i = 0; i < 2; ++i) {
- TextureWithView layer = gpu_create_storage_texture_2d(
- ctx_.device, width_, height_, WGPUTextureFormat_RGBA32Uint);
- layer_textures_.push_back(layer.texture);
- layer_views_.push_back(layer.view);
- }
-
- // Create uniform buffer for static feature params
- WGPUBufferDescriptor params_desc = {};
- params_desc.size = sizeof(StaticFeatureParams);
- params_desc.usage = WGPUBufferUsage_Uniform | WGPUBufferUsage_CopyDst;
- params_desc.mappedAtCreation = false;
- static_params_buffer_ = wgpuDeviceCreateBuffer(ctx_.device, &params_desc);
-}
-
-void CNNv2Effect::create_pipelines() {
- // Create linear sampler for bilinear interpolation
- WGPUSamplerDescriptor sampler_desc = {};
- sampler_desc.addressModeU = WGPUAddressMode_ClampToEdge;
- sampler_desc.addressModeV = WGPUAddressMode_ClampToEdge;
- sampler_desc.addressModeW = WGPUAddressMode_ClampToEdge;
- sampler_desc.magFilter = WGPUFilterMode_Linear;
- sampler_desc.minFilter = WGPUFilterMode_Linear;
- sampler_desc.mipmapFilter = WGPUMipmapFilterMode_Linear;
- sampler_desc.lodMinClamp = 0.0f;
- sampler_desc.lodMaxClamp = 32.0f;
- sampler_desc.maxAnisotropy = 1;
-
- linear_sampler_ = wgpuDeviceCreateSampler(ctx_.device, &sampler_desc);
-
- // Static features compute pipeline
- size_t shader_size = 0;
- const char* static_code =
- (const char*)GetAsset(AssetId::ASSET_SHADER_CNN_V2_STATIC, &shader_size);
-
- if (!static_code || shader_size == 0) {
- // Shader not available (e.g., in test mode) - skip pipeline creation
- return;
- }
-
- WGPUShaderSourceWGSL wgsl_src = {};
- wgsl_src.chain.sType = WGPUSType_ShaderSourceWGSL;
- wgsl_src.code = str_view(static_code);
-
- WGPUShaderModuleDescriptor shader_desc = {};
- shader_desc.nextInChain = &wgsl_src.chain;
-
- // Create bind group layout for static features compute
- // Bindings: 0=input_tex, 1=input_mip1, 2=input_mip2, 3=depth_tex, 4=output,
- // 5=params, 6=linear_sampler
- WGPUBindGroupLayout static_bgl =
- BindGroupLayoutBuilder()
- .texture(0, WGPUShaderStage_Compute)
- .texture(1, WGPUShaderStage_Compute)
- .texture(2, WGPUShaderStage_Compute)
- .texture(3, WGPUShaderStage_Compute)
- .storage_texture(4, WGPUShaderStage_Compute,
- WGPUTextureFormat_RGBA32Uint)
- .uniform(5, WGPUShaderStage_Compute, sizeof(StaticFeatureParams))
- .sampler(6, WGPUShaderStage_Compute)
- .build(ctx_.device);
-
- // Update pipeline layout
- WGPUPipelineLayoutDescriptor pl_desc = {};
- pl_desc.bindGroupLayoutCount = 1;
- pl_desc.bindGroupLayouts = &static_bgl;
- WGPUPipelineLayout pipeline_layout =
- wgpuDeviceCreatePipelineLayout(ctx_.device, &pl_desc);
-
- // Recreate pipeline with proper layout
- WGPUComputePipelineDescriptor pipeline_desc2 = {};
- pipeline_desc2.compute.module =
- wgpuDeviceCreateShaderModule(ctx_.device, &shader_desc);
- pipeline_desc2.compute.entryPoint = str_view("main");
- pipeline_desc2.layout = pipeline_layout;
-
- if (static_pipeline_)
- wgpuComputePipelineRelease(static_pipeline_);
- static_pipeline_ =
- wgpuDeviceCreateComputePipeline(ctx_.device, &pipeline_desc2);
-
- wgpuShaderModuleRelease(pipeline_desc2.compute.module);
- wgpuPipelineLayoutRelease(pipeline_layout);
- wgpuBindGroupLayoutRelease(static_bgl);
-
- // CNN layer compute pipeline (storage buffer version)
- if (layer_info_.empty())
- return; // No weights loaded
-
- size_t layer_shader_size = 0;
- const char* layer_code = (const char*)GetAsset(
- AssetId::ASSET_SHADER_CNN_V2_COMPUTE, &layer_shader_size);
-
- if (!layer_code || layer_shader_size == 0)
- return;
-
- WGPUShaderSourceWGSL layer_wgsl = {};
- layer_wgsl.chain.sType = WGPUSType_ShaderSourceWGSL;
- layer_wgsl.code = str_view(layer_code);
-
- WGPUShaderModuleDescriptor layer_shader_desc = {};
- layer_shader_desc.nextInChain = &layer_wgsl.chain;
-
- WGPUShaderModule layer_module =
- wgpuDeviceCreateShaderModule(ctx_.device, &layer_shader_desc);
- if (!layer_module)
- return;
-
- // Create bind group layout for layer compute
- // 0=static_features, 1=layer_input, 2=output, 3=weights, 4=params,
- // 5=original_input
- WGPUBindGroupLayout layer_bgl =
- BindGroupLayoutBuilder()
- .uint_texture(0, WGPUShaderStage_Compute)
- .uint_texture(1, WGPUShaderStage_Compute)
- .storage_texture(2, WGPUShaderStage_Compute,
- WGPUTextureFormat_RGBA32Uint)
- .storage(3, WGPUShaderStage_Compute)
- .uniform(4, WGPUShaderStage_Compute, sizeof(LayerParams))
- .texture(5, WGPUShaderStage_Compute)
- .build(ctx_.device);
-
- WGPUPipelineLayoutDescriptor layer_pl_desc = {};
- layer_pl_desc.bindGroupLayoutCount = 1;
- layer_pl_desc.bindGroupLayouts = &layer_bgl;
-
- WGPUPipelineLayout layer_pipeline_layout =
- wgpuDeviceCreatePipelineLayout(ctx_.device, &layer_pl_desc);
-
- WGPUComputePipelineDescriptor layer_pipeline_desc = {};
- layer_pipeline_desc.compute.module = layer_module;
- layer_pipeline_desc.compute.entryPoint = str_view("main");
- layer_pipeline_desc.layout = layer_pipeline_layout;
-
- layer_pipeline_ =
- wgpuDeviceCreateComputePipeline(ctx_.device, &layer_pipeline_desc);
-
- wgpuShaderModuleRelease(layer_module);
- wgpuPipelineLayoutRelease(layer_pipeline_layout);
- wgpuBindGroupLayoutRelease(layer_bgl);
-}
-
-void CNNv2Effect::update_bind_group(WGPUTextureView input_view) {
- if (!static_pipeline_)
- return;
-
- // Cache input view
- current_input_view_ = input_view;
-
- // Release old bind group
- if (static_bind_group_) {
- wgpuBindGroupRelease(static_bind_group_);
- static_bind_group_ = nullptr;
- }
-
- // Create bind group for static features compute (manual for storage texture
- // binding)
- WGPUBindGroupEntry bg_entries[7] = {};
- bg_entries[0].binding = 0;
- bg_entries[0].textureView = input_view;
- bg_entries[1].binding = 1;
- bg_entries[1].textureView = input_mip_view_[0];
- bg_entries[2].binding = 2;
- bg_entries[2].textureView =
- input_mip_view_[1] ? input_mip_view_[1] : input_mip_view_[0];
- bg_entries[3].binding = 3;
- bg_entries[3].textureView = input_view;
- bg_entries[4].binding = 4;
- bg_entries[4].textureView = static_features_view_;
- bg_entries[5].binding = 5;
- bg_entries[5].buffer = static_params_buffer_;
- bg_entries[5].size = sizeof(StaticFeatureParams);
- bg_entries[6].binding = 6;
- bg_entries[6].sampler = linear_sampler_;
-
- WGPUBindGroupLayout layout =
- wgpuComputePipelineGetBindGroupLayout(static_pipeline_, 0);
- WGPUBindGroupDescriptor bg_desc = {};
- bg_desc.layout = layout;
- bg_desc.entryCount = 7;
- bg_desc.entries = bg_entries;
- static_bind_group_ = wgpuDeviceCreateBindGroup(ctx_.device, &bg_desc);
- wgpuBindGroupLayoutRelease(layout);
-
- // Create layer bind groups
- if (!layer_pipeline_ || layer_info_.empty())
- return;
-
- // Release old layer bind groups
- for (auto bg : layer_bind_groups_) {
- wgpuBindGroupRelease(bg);
- }
- layer_bind_groups_.clear();
-
- // Get bind group layout from layer pipeline
- WGPUBindGroupLayout layer_bgl =
- wgpuComputePipelineGetBindGroupLayout(layer_pipeline_, 0);
-
- // Create bind group for each layer
- for (size_t i = 0; i < layer_info_.size(); ++i) {
- WGPUTextureView layer_input =
- (i == 0) ? static_features_view_ : layer_views_[i % 2];
-
- WGPUBindGroup layer_bg =
- BindGroupBuilder()
- .texture(0, static_features_view_)
- .texture(1, layer_input)
- .texture(2, layer_views_[(i + 1) % 2])
- .buffer(3, weights_buffer_, wgpuBufferGetSize(weights_buffer_))
- .buffer(4, layer_params_buffers_[i], sizeof(LayerParams))
- .texture(5, input_view)
- .build(ctx_.device, layer_bgl);
-
- layer_bind_groups_.push_back(layer_bg);
- }
-
- wgpuBindGroupLayoutRelease(layer_bgl);
-}
-
-void CNNv2Effect::compute(WGPUCommandEncoder encoder,
- const CommonPostProcessUniforms& uniforms) {
- if (!initialized_ || !static_pipeline_ || !static_bind_group_)
- return;
-
- float effective_blend = blend_amount_;
- if (beat_modulated_) {
- effective_blend = blend_amount_ * uniforms.beat_phase * beat_scale_;
- }
-
- // Update static feature params
- StaticFeatureParams static_params;
- static_params.mip_level = mip_level_;
- static_params.padding[0] = 0;
- static_params.padding[1] = 0;
- static_params.padding[2] = 0;
- wgpuQueueWriteBuffer(ctx_.queue, static_params_buffer_, 0, &static_params,
- sizeof(static_params));
-
- // Pass 1: Compute static features
- WGPUComputePassEncoder pass =
- wgpuCommandEncoderBeginComputePass(encoder, nullptr);
-
- wgpuComputePassEncoderSetPipeline(pass, static_pipeline_);
- wgpuComputePassEncoderSetBindGroup(pass, 0, static_bind_group_, 0, nullptr);
-
- // Dispatch workgroups (8×8 threads per group)
- uint32_t workgroups_x = (width_ + 7) / 8;
- uint32_t workgroups_y = (height_ + 7) / 8;
- wgpuComputePassEncoderDispatchWorkgroups(pass, workgroups_x, workgroups_y, 1);
-
- wgpuComputePassEncoderEnd(pass);
- wgpuComputePassEncoderRelease(pass);
-
- // Execute CNN layer passes
- if (!layer_pipeline_ || layer_bind_groups_.empty())
- return;
-
- // Update layer params (each layer has own buffer)
- for (size_t i = 0; i < layer_info_.size(); ++i) {
- const LayerInfo& info = layer_info_[i];
-
- LayerParams params;
- params.kernel_size = info.kernel_size;
- params.in_channels = info.in_channels;
- params.out_channels = info.out_channels;
- params.weight_offset = info.weight_offset;
- params.is_output_layer = (i == layer_info_.size() - 1) ? 1 : 0;
- params.blend_amount = effective_blend;
- params.is_layer_0 = (i == 0) ? 1 : 0;
-
- wgpuQueueWriteBuffer(ctx_.queue, layer_params_buffers_[i], 0, &params,
- sizeof(params));
-
- WGPUComputePassEncoder layer_pass =
- wgpuCommandEncoderBeginComputePass(encoder, nullptr);
-
- wgpuComputePassEncoderSetPipeline(layer_pass, layer_pipeline_);
- wgpuComputePassEncoderSetBindGroup(layer_pass, 0, layer_bind_groups_[i], 0,
- nullptr);
-
- wgpuComputePassEncoderDispatchWorkgroups(layer_pass, workgroups_x,
- workgroups_y, 1);
-
- wgpuComputePassEncoderEnd(layer_pass);
- wgpuComputePassEncoderRelease(layer_pass);
- }
-}
-
-void CNNv2Effect::render(WGPURenderPassEncoder pass,
- const CommonPostProcessUniforms& uniforms) {
- (void)pass;
- (void)uniforms;
- // Compute-only effect, rendering is done by default composite pass
-}
-
-void CNNv2Effect::cleanup() {
- if (static_features_view_)
- wgpuTextureViewRelease(static_features_view_);
- if (static_features_tex_)
- wgpuTextureRelease(static_features_tex_);
- if (static_bind_group_)
- wgpuBindGroupRelease(static_bind_group_);
- if (static_params_buffer_)
- wgpuBufferRelease(static_params_buffer_);
- if (static_pipeline_)
- wgpuComputePipelineRelease(static_pipeline_);
- if (linear_sampler_)
- wgpuSamplerRelease(linear_sampler_);
-
- if (layer_pipeline_)
- wgpuComputePipelineRelease(layer_pipeline_);
- if (weights_buffer_)
- wgpuBufferRelease(weights_buffer_);
- for (auto buf : layer_params_buffers_)
- wgpuBufferRelease(buf);
- layer_params_buffers_.clear();
-
- for (int i = 0; i < 3; ++i) {
- if (input_mip_view_[i])
- wgpuTextureViewRelease(input_mip_view_[i]);
- }
- if (input_mip_tex_)
- wgpuTextureRelease(input_mip_tex_);
-
- for (auto view : layer_views_)
- wgpuTextureViewRelease(view);
- for (auto tex : layer_textures_)
- wgpuTextureRelease(tex);
- for (auto bg : layer_bind_groups_)
- wgpuBindGroupRelease(bg);
-
- layer_views_.clear();
- layer_textures_.clear();
- layer_bind_groups_.clear();
- layer_info_.clear();
-
- initialized_ = false;
-}
diff --git a/src/effects/cnn_v2_effect.h b/src/effects/cnn_v2_effect.h
deleted file mode 100644
index 7960b4f..0000000
--- a/src/effects/cnn_v2_effect.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// CNN v2 Effect - Parametric Static Features
-// Multi-pass post-processing with 7D feature input
-// Supports per-layer kernel sizes (e.g., 1×1, 3×3, 5×5)
-
-#pragma once
-#include "gpu/effect.h"
-#include <vector>
-
-struct CNNv2EffectParams {
- float blend_amount = 1.0f;
-};
-
-class CNNv2Effect : public PostProcessEffect {
- public:
- explicit CNNv2Effect(const GpuContext& ctx);
- explicit CNNv2Effect(const GpuContext& ctx, const CNNv2EffectParams& params);
- ~CNNv2Effect();
-
- void init(MainSequence* demo) override;
- void resize(int width, int height) override;
- void compute(WGPUCommandEncoder encoder,
- const CommonPostProcessUniforms& uniforms) override;
- void render(WGPURenderPassEncoder pass,
- const CommonPostProcessUniforms& uniforms) override;
- void update_bind_group(WGPUTextureView input_view) override;
-
- void set_beat_modulation(bool enabled, float scale = 1.0f) {
- beat_modulated_ = enabled;
- beat_scale_ = scale;
- }
-
- private:
- struct LayerInfo {
- uint32_t kernel_size;
- uint32_t in_channels;
- uint32_t out_channels;
- uint32_t weight_offset;
- uint32_t weight_count;
- };
-
- struct LayerParams {
- uint32_t kernel_size;
- uint32_t in_channels;
- uint32_t out_channels;
- uint32_t weight_offset;
- uint32_t is_output_layer;
- float blend_amount;
- uint32_t is_layer_0;
- };
-
- struct StaticFeatureParams {
- uint32_t mip_level;
- uint32_t padding[3];
- };
-
- void create_textures();
- void create_pipelines();
- void load_weights();
- void cleanup();
-
- // Static features compute
- WGPUComputePipeline static_pipeline_;
- WGPUBindGroup static_bind_group_;
- WGPUBuffer static_params_buffer_;
- WGPUTexture static_features_tex_;
- WGPUTextureView static_features_view_;
- WGPUSampler linear_sampler_;
-
- // CNN layers (storage buffer architecture)
- WGPUComputePipeline layer_pipeline_; // Single pipeline for all layers
- WGPUBuffer weights_buffer_; // Storage buffer for weights
- std::vector<WGPUBuffer>
- layer_params_buffers_; // Uniform buffers (one per layer)
- std::vector<LayerInfo> layer_info_; // Layer metadata
- std::vector<WGPUBindGroup> layer_bind_groups_; // Per-layer bind groups
- std::vector<WGPUTexture> layer_textures_; // Ping-pong buffers
- std::vector<WGPUTextureView> layer_views_;
-
- // Input mips
- WGPUTexture input_mip_tex_;
- WGPUTextureView input_mip_view_[3];
- WGPUTextureView current_input_view_;
-
- float blend_amount_ = 1.0f;
- bool beat_modulated_ = false;
- float beat_scale_ = 1.0f;
- uint32_t mip_level_ = 0;
- bool initialized_;
-};
diff --git a/src/effects/flash_cube_effect.cc b/src/effects/flash_cube_effect.cc
index 29e9897..383e66a 100644
--- a/src/effects/flash_cube_effect.cc
+++ b/src/effects/flash_cube_effect.cc
@@ -60,12 +60,12 @@ void FlashCubeEffect::render(WGPURenderPassEncoder pass,
// Detect beat changes for flash trigger (using intensity as proxy for beat
// hits) Intensity spikes on beats, so we can use it to trigger flashes
if (uniforms.audio_intensity > 0.5f &&
- flash_intensity_ < 0.3f) { // High intensity + flash cooled down
+ flash_intensity_ < 0.2f) { // High intensity + flash cooled down
flash_intensity_ = 1.0f; // Trigger full flash
}
// Exponential decay of flash
- flash_intensity_ *= 0.90f; // Slower fade for more visible effect
+ flash_intensity_ *= 0.95f; // Slower fade for more visible effect
// Always have base brightness, add flash on top
float base_brightness = 0.2f;
@@ -80,7 +80,7 @@ void FlashCubeEffect::render(WGPURenderPassEncoder pass,
// Slowly rotate the cube for visual interest
scene_.objects[0].rotation =
- quat::from_axis(vec3(0.3f, 1, 0.2f), uniforms.time * 0.05f);
+ quat::from_axis(vec3(0.3f, 1, 0.2f), uniforms.time * 0.04f);
// Position camera OUTSIDE the cube looking at it from a distance
// This way we see the cube as a background element
diff --git a/src/effects/gaussian_blur_effect.h b/src/effects/gaussian_blur_effect.h
index 651c5c3..bf1062f 100644
--- a/src/effects/gaussian_blur_effect.h
+++ b/src/effects/gaussian_blur_effect.h
@@ -8,9 +8,9 @@
// Parameters for GaussianBlurEffect (set at construction time)
struct GaussianBlurParams {
- float strength = 1.0f; // Default
+ float strength = 1.0f; // Default
float strength_audio = 0.5f; // how much to pulse with audio
- float stretch = 1.f; // y/x axis ratio
+ float stretch = 1.f; // y/x axis ratio
float _pad = 0.;
};
static_assert(sizeof(GaussianBlurParams) == 16,
diff --git a/src/effects/particle_spray_effect.h b/src/effects/particle_spray_effect.h
index c83d691..216e13f 100644
--- a/src/effects/particle_spray_effect.h
+++ b/src/effects/particle_spray_effect.h
@@ -3,8 +3,8 @@
#pragma once
-#include "gpu/effect.h"
#include "effects/particle_defs.h"
+#include "gpu/effect.h"
class ParticleSprayEffect : public Effect {
public:
diff --git a/src/effects/particles_effect.h b/src/effects/particles_effect.h
index 6d46ea2..a69039f 100644
--- a/src/effects/particles_effect.h
+++ b/src/effects/particles_effect.h
@@ -3,8 +3,8 @@
#pragma once
-#include "gpu/effect.h"
#include "effects/particle_defs.h"
+#include "gpu/effect.h"
class ParticlesEffect : public Effect {
public:
diff --git a/src/effects/sdf_test_effect.cc b/src/effects/sdf_test_effect.cc
index 28b3513..264809f 100644
--- a/src/effects/sdf_test_effect.cc
+++ b/src/effects/sdf_test_effect.cc
@@ -9,8 +9,8 @@ SDFTestEffect::SDFTestEffect(const GpuContext& ctx) : SDFEffect(ctx) {
ResourceBinding bindings[] = {
{uniforms_.get(), WGPUBufferBindingType_Uniform},
{camera_params_.get(), WGPUBufferBindingType_Uniform}};
- pass_ = gpu_create_render_pass(ctx_.device, ctx_.format,
- sdf_test_shader_wgsl, bindings, 2);
+ pass_ = gpu_create_render_pass(ctx_.device, ctx_.format, sdf_test_shader_wgsl,
+ bindings, 2);
pass_.vertex_count = 3;
}
generated by cgit v1.2.3 (git 2.51.0) at 2026-02-15 21:00:44 +0000