summaryrefslogtreecommitdiff
path: root/src/effects
diff options
context:
space:
mode:
Diffstat (limited to 'src/effects')
-rw-r--r--src/effects/flash_effect.cc58
-rw-r--r--src/effects/flash_effect.h10
-rw-r--r--src/effects/gaussian_blur_effect.cc30
-rw-r--r--src/effects/gaussian_blur_effect.h2
-rw-r--r--src/effects/heptagon_effect.cc61
-rw-r--r--src/effects/heptagon_effect.h10
-rw-r--r--src/effects/hybrid3_d_effect.cc7
-rw-r--r--src/effects/particles_effect.cc18
-rw-r--r--src/effects/particles_effect.h1
-rw-r--r--src/effects/passthrough_effect.cc44
-rw-r--r--src/effects/passthrough_effect.h7
-rw-r--r--src/effects/peak_meter_effect.cc7
-rw-r--r--src/effects/peak_meter_effect.h1
-rw-r--r--src/effects/placeholder_effect.cc26
-rw-r--r--src/effects/placeholder_effect.h2
-rw-r--r--src/effects/rotating_cube_effect.cc6
16 files changed, 69 insertions, 221 deletions
diff --git a/src/effects/flash_effect.cc b/src/effects/flash_effect.cc
index c8638f0..93ff4dd 100644
--- a/src/effects/flash_effect.cc
+++ b/src/effects/flash_effect.cc
@@ -9,47 +9,15 @@
Flash::Flash(const GpuContext& ctx, const std::vector<std::string>& inputs,
const std::vector<std::string>& outputs, float start_time,
float end_time)
- : Effect(ctx, inputs, outputs, start_time, end_time), pipeline_(nullptr),
- bind_group_(nullptr), sampler_(nullptr), dummy_texture_(nullptr),
- dummy_texture_view_(nullptr) {
+ : Effect(ctx, inputs, outputs, start_time, end_time) {
HEADLESS_RETURN_IF_NULL(ctx_.device);
- uniforms_buffer_.init(ctx_.device);
- pipeline_ = create_post_process_pipeline(
- ctx_.device, WGPUTextureFormat_RGBA8Unorm, flash_shader_wgsl);
+ init_uniforms_buffer();
+ create_nearest_sampler();
+ create_dummy_scene_texture();
- // Create dummy sampler (scene effects don't use texture input)
- WGPUSamplerDescriptor sampler_desc = {};
- sampler_desc.addressModeU = WGPUAddressMode_ClampToEdge;
- sampler_desc.addressModeV = WGPUAddressMode_ClampToEdge;
- sampler_desc.magFilter = WGPUFilterMode_Nearest;
- sampler_desc.minFilter = WGPUFilterMode_Nearest;
- sampler_desc.maxAnisotropy = 1;
- sampler_ = wgpuDeviceCreateSampler(ctx_.device, &sampler_desc);
-
- // Create 1×1 dummy texture
- WGPUTextureDescriptor tex_desc = {};
- tex_desc.size = {1, 1, 1};
- tex_desc.format = WGPUTextureFormat_RGBA8Unorm;
- tex_desc.usage = WGPUTextureUsage_TextureBinding;
- tex_desc.dimension = WGPUTextureDimension_2D;
- tex_desc.mipLevelCount = 1;
- tex_desc.sampleCount = 1;
- dummy_texture_ = wgpuDeviceCreateTexture(ctx_.device, &tex_desc);
- dummy_texture_view_ = wgpuTextureCreateView(dummy_texture_, nullptr);
-}
-
-Flash::~Flash() {
- if (bind_group_)
- wgpuBindGroupRelease(bind_group_);
- if (pipeline_)
- wgpuRenderPipelineRelease(pipeline_);
- if (sampler_)
- wgpuSamplerRelease(sampler_);
- if (dummy_texture_view_)
- wgpuTextureViewRelease(dummy_texture_view_);
- if (dummy_texture_)
- wgpuTextureRelease(dummy_texture_);
+ pipeline_.set(create_post_process_pipeline(
+ ctx_.device, WGPUTextureFormat_RGBA8Unorm, flash_shader_wgsl));
}
void Flash::render(WGPUCommandEncoder encoder,
@@ -61,17 +29,13 @@ void Flash::render(WGPUCommandEncoder encoder,
uniforms_buffer_.update(ctx_.queue, params);
// Update bind group (use dummy texture for scene effect)
- pp_update_bind_group(ctx_.device, pipeline_, &bind_group_,
- dummy_texture_view_, uniforms_buffer_.get(),
+ pp_update_bind_group(ctx_.device, pipeline_.get(), bind_group_.get_address(),
+ dummy_texture_view_.get(), uniforms_buffer_.get(),
{nullptr, 0});
// Render pass
WGPURenderPassColorAttachment color_attachment = {};
- color_attachment.view = output_view;
- color_attachment.depthSlice = WGPU_DEPTH_SLICE_UNDEFINED;
- color_attachment.loadOp = WGPULoadOp_Clear;
- color_attachment.storeOp = WGPUStoreOp_Store;
- color_attachment.clearValue = {0.0, 0.0, 0.0, 1.0};
+ gpu_init_color_attachment(color_attachment, output_view);
WGPURenderPassDescriptor pass_desc = {};
pass_desc.colorAttachmentCount = 1;
@@ -79,8 +43,8 @@ void Flash::render(WGPUCommandEncoder encoder,
WGPURenderPassEncoder pass =
wgpuCommandEncoderBeginRenderPass(encoder, &pass_desc);
- wgpuRenderPassEncoderSetPipeline(pass, pipeline_);
- wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_, 0, nullptr);
+ wgpuRenderPassEncoderSetPipeline(pass, pipeline_.get());
+ wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_.get(), 0, nullptr);
wgpuRenderPassEncoderDraw(pass, 3, 1, 0, 0);
wgpuRenderPassEncoderEnd(pass);
wgpuRenderPassEncoderRelease(pass);
diff --git a/src/effects/flash_effect.h b/src/effects/flash_effect.h
index 1117e0a..052957d 100644
--- a/src/effects/flash_effect.h
+++ b/src/effects/flash_effect.h
@@ -4,22 +4,18 @@
#pragma once
#include "gpu/effect.h"
#include "gpu/uniform_helper.h"
+#include "gpu/wgpu_resource.h"
class Flash : public Effect {
public:
Flash(const GpuContext& ctx, const std::vector<std::string>& inputs,
const std::vector<std::string>& outputs, float start_time,
float end_time);
- ~Flash() override;
void render(WGPUCommandEncoder encoder, const UniformsSequenceParams& params,
NodeRegistry& nodes) override;
private:
- WGPURenderPipeline pipeline_;
- WGPUBindGroup bind_group_;
- WGPUSampler sampler_;
- WGPUTexture dummy_texture_;
- WGPUTextureView dummy_texture_view_;
- UniformBuffer<UniformsSequenceParams> uniforms_buffer_;
+ RenderPipeline pipeline_;
+ BindGroup bind_group_;
};
diff --git a/src/effects/gaussian_blur_effect.cc b/src/effects/gaussian_blur_effect.cc
index 02cd77e..0548b4a 100644
--- a/src/effects/gaussian_blur_effect.cc
+++ b/src/effects/gaussian_blur_effect.cc
@@ -9,27 +9,15 @@ GaussianBlur::GaussianBlur(const GpuContext& ctx,
const std::vector<std::string>& inputs,
const std::vector<std::string>& outputs, float start_time,
float end_time)
- : Effect(ctx, inputs, outputs, start_time, end_time), pipeline_(nullptr), bind_group_(nullptr),
- sampler_(nullptr) {
- // Headless mode: skip GPU resource creation (compiled out in STRIP_ALL)
+ : Effect(ctx, inputs, outputs, start_time, end_time), pipeline_(nullptr), bind_group_(nullptr) {
HEADLESS_RETURN_IF_NULL(ctx_.device);
- // Create pipeline
+ init_uniforms_buffer();
+ create_linear_sampler();
+ params_buffer_.init(ctx_.device);
+
pipeline_ = create_post_process_pipeline(
ctx_.device, WGPUTextureFormat_RGBA8Unorm, gaussian_blur_shader_wgsl);
-
- // Create sampler
- WGPUSamplerDescriptor sampler_desc = {};
- sampler_desc.addressModeU = WGPUAddressMode_ClampToEdge;
- sampler_desc.addressModeV = WGPUAddressMode_ClampToEdge;
- sampler_desc.magFilter = WGPUFilterMode_Linear;
- sampler_desc.minFilter = WGPUFilterMode_Linear;
- sampler_desc.maxAnisotropy = 1;
- sampler_ = wgpuDeviceCreateSampler(ctx_.device, &sampler_desc);
-
- // Init uniform buffers
- params_buffer_.init(ctx_.device);
- uniforms_buffer_.init(ctx_.device);
}
void GaussianBlur::render(WGPUCommandEncoder encoder,
@@ -46,7 +34,7 @@ void GaussianBlur::render(WGPUCommandEncoder encoder,
// Update bind group
WGPUBindGroupEntry entries[4] = {};
entries[0].binding = PP_BINDING_SAMPLER;
- entries[0].sampler = sampler_;
+ entries[0].sampler = sampler_.get();
entries[1].binding = PP_BINDING_TEXTURE;
entries[1].textureView = input_view;
entries[2].binding = PP_BINDING_UNIFORMS;
@@ -68,11 +56,7 @@ void GaussianBlur::render(WGPUCommandEncoder encoder,
// Render pass
WGPURenderPassColorAttachment color_attachment = {};
- color_attachment.view = output_view;
- color_attachment.depthSlice = WGPU_DEPTH_SLICE_UNDEFINED;
- color_attachment.loadOp = WGPULoadOp_Clear;
- color_attachment.storeOp = WGPUStoreOp_Store;
- color_attachment.clearValue = {0.0, 0.0, 0.0, 1.0};
+ gpu_init_color_attachment(color_attachment, output_view);
WGPURenderPassDescriptor pass_desc = {};
pass_desc.colorAttachmentCount = 1;
diff --git a/src/effects/gaussian_blur_effect.h b/src/effects/gaussian_blur_effect.h
index cc9ff56..f4b8fcf 100644
--- a/src/effects/gaussian_blur_effect.h
+++ b/src/effects/gaussian_blur_effect.h
@@ -26,8 +26,6 @@ class GaussianBlur : public Effect {
private:
WGPURenderPipeline pipeline_;
WGPUBindGroup bind_group_;
- WGPUSampler sampler_;
GaussianBlurParams blur_params_;
UniformBuffer<GaussianBlurParams> params_buffer_;
- UniformBuffer<UniformsSequenceParams> uniforms_buffer_;
};
diff --git a/src/effects/heptagon_effect.cc b/src/effects/heptagon_effect.cc
index 13d7aad..c9ec17c 100644
--- a/src/effects/heptagon_effect.cc
+++ b/src/effects/heptagon_effect.cc
@@ -10,50 +10,15 @@ Heptagon::Heptagon(const GpuContext& ctx,
const std::vector<std::string>& inputs,
const std::vector<std::string>& outputs, float start_time,
float end_time)
- : Effect(ctx, inputs, outputs, start_time, end_time), pipeline_(nullptr), bind_group_(nullptr),
- sampler_(nullptr) {
- // Headless mode: skip GPU resource creation (compiled out in STRIP_ALL)
+ : Effect(ctx, inputs, outputs, start_time, end_time) {
HEADLESS_RETURN_IF_NULL(ctx_.device);
- // Init uniforms
- uniforms_buffer_.init(ctx_.device);
+ init_uniforms_buffer();
+ create_nearest_sampler();
+ create_dummy_scene_texture();
- // Create pipeline (standard post-process, no depth)
- pipeline_ = create_post_process_pipeline(
- ctx_.device, WGPUTextureFormat_RGBA8Unorm, heptagon_shader_wgsl);
-
- // Create dummy sampler (scene effects don't use texture input)
- WGPUSamplerDescriptor sampler_desc = {};
- sampler_desc.addressModeU = WGPUAddressMode_ClampToEdge;
- sampler_desc.addressModeV = WGPUAddressMode_ClampToEdge;
- sampler_desc.magFilter = WGPUFilterMode_Nearest;
- sampler_desc.minFilter = WGPUFilterMode_Nearest;
- sampler_desc.maxAnisotropy = 1;
- sampler_ = wgpuDeviceCreateSampler(ctx_.device, &sampler_desc);
-
- // Create 1×1 dummy texture
- WGPUTextureDescriptor tex_desc = {};
- tex_desc.size = {1, 1, 1};
- tex_desc.format = WGPUTextureFormat_RGBA8Unorm;
- tex_desc.usage = WGPUTextureUsage_TextureBinding;
- tex_desc.dimension = WGPUTextureDimension_2D;
- tex_desc.mipLevelCount = 1;
- tex_desc.sampleCount = 1;
- dummy_texture_ = wgpuDeviceCreateTexture(ctx_.device, &tex_desc);
- dummy_texture_view_ = wgpuTextureCreateView(dummy_texture_, nullptr);
-}
-
-Heptagon::~Heptagon() {
- if (bind_group_)
- wgpuBindGroupRelease(bind_group_);
- if (pipeline_)
- wgpuRenderPipelineRelease(pipeline_);
- if (sampler_)
- wgpuSamplerRelease(sampler_);
- if (dummy_texture_view_)
- wgpuTextureViewRelease(dummy_texture_view_);
- if (dummy_texture_)
- wgpuTextureRelease(dummy_texture_);
+ pipeline_.set(create_post_process_pipeline(
+ ctx_.device, WGPUTextureFormat_RGBA8Unorm, heptagon_shader_wgsl));
}
void Heptagon::render(WGPUCommandEncoder encoder,
@@ -66,17 +31,13 @@ void Heptagon::render(WGPUCommandEncoder encoder,
uniforms_buffer_.update(ctx_.queue, params);
// Create bind group (use dummy texture for scene effect)
- pp_update_bind_group(ctx_.device, pipeline_, &bind_group_,
- dummy_texture_view_, uniforms_buffer_.get(),
+ pp_update_bind_group(ctx_.device, pipeline_.get(), bind_group_.get_address(),
+ dummy_texture_view_.get(), uniforms_buffer_.get(),
{nullptr, 0});
// Render pass
WGPURenderPassColorAttachment color_attachment = {};
- color_attachment.view = output_view;
- color_attachment.depthSlice = WGPU_DEPTH_SLICE_UNDEFINED;
- color_attachment.loadOp = WGPULoadOp_Clear;
- color_attachment.storeOp = WGPUStoreOp_Store;
- color_attachment.clearValue = {0.0, 0.0, 0.0, 1.0};
+ gpu_init_color_attachment(color_attachment, output_view);
WGPURenderPassDescriptor pass_desc = {};
pass_desc.colorAttachmentCount = 1;
@@ -84,8 +45,8 @@ void Heptagon::render(WGPUCommandEncoder encoder,
WGPURenderPassEncoder pass =
wgpuCommandEncoderBeginRenderPass(encoder, &pass_desc);
- wgpuRenderPassEncoderSetPipeline(pass, pipeline_);
- wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_, 0, nullptr);
+ wgpuRenderPassEncoderSetPipeline(pass, pipeline_.get());
+ wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_.get(), 0, nullptr);
wgpuRenderPassEncoderDraw(pass, 3, 1, 0, 0); // Fullscreen triangle
wgpuRenderPassEncoderEnd(pass);
wgpuRenderPassEncoderRelease(pass);
diff --git a/src/effects/heptagon_effect.h b/src/effects/heptagon_effect.h
index ef05d79..4563e47 100644
--- a/src/effects/heptagon_effect.h
+++ b/src/effects/heptagon_effect.h
@@ -4,22 +4,18 @@
#include "gpu/effect.h"
#include "gpu/uniform_helper.h"
+#include "gpu/wgpu_resource.h"
class Heptagon : public Effect {
public:
Heptagon(const GpuContext& ctx, const std::vector<std::string>& inputs,
const std::vector<std::string>& outputs, float start_time,
float end_time);
- ~Heptagon();
void render(WGPUCommandEncoder encoder, const UniformsSequenceParams& params,
NodeRegistry& nodes) override;
private:
- WGPURenderPipeline pipeline_;
- WGPUBindGroup bind_group_;
- WGPUSampler sampler_;
- WGPUTexture dummy_texture_;
- WGPUTextureView dummy_texture_view_;
- UniformBuffer<UniformsSequenceParams> uniforms_buffer_;
+ RenderPipeline pipeline_;
+ BindGroup bind_group_;
};
diff --git a/src/effects/hybrid3_d_effect.cc b/src/effects/hybrid3_d_effect.cc
index 1dd1c05..5832b57 100644
--- a/src/effects/hybrid3_d_effect.cc
+++ b/src/effects/hybrid3_d_effect.cc
@@ -106,12 +106,7 @@ void Hybrid3D::render(WGPUCommandEncoder encoder,
// Render 3D scene using sequence encoder
WGPURenderPassColorAttachment color_attachment = {};
-#if !defined(DEMO_CROSS_COMPILE_WIN32)
- color_attachment.depthSlice = WGPU_DEPTH_SLICE_UNDEFINED;
-#endif
- color_attachment.view = color_view;
- color_attachment.loadOp = WGPULoadOp_Clear;
- color_attachment.storeOp = WGPUStoreOp_Store;
+ gpu_init_color_attachment(color_attachment, color_view);
color_attachment.clearValue = {0.05f, 0.05f, 0.05f, 1.0f};
WGPURenderPassDepthStencilAttachment depth_attachment = {};
diff --git a/src/effects/particles_effect.cc b/src/effects/particles_effect.cc
index 22e41e9..3c9feb7 100644
--- a/src/effects/particles_effect.cc
+++ b/src/effects/particles_effect.cc
@@ -12,11 +12,9 @@ Particles::Particles(const GpuContext& ctx,
const std::vector<std::string>& outputs, float start_time,
float end_time)
: Effect(ctx, inputs, outputs, start_time, end_time) {
- // Headless mode: skip GPU resource creation (compiled out in STRIP_ALL)
HEADLESS_RETURN_IF_NULL(ctx_.device);
- // Initialize uniforms
- uniforms_.init(ctx_.device);
+ init_uniforms_buffer();
// Initialize particles buffer
std::vector<Particle> init_p(NUM_PARTICLES);
@@ -49,7 +47,7 @@ Particles::Particles(const GpuContext& ctx,
// Create compute shader (particle simulation)
ResourceBinding compute_bindings[] = {
{particles_buffer_, WGPUBufferBindingType_Storage},
- {uniforms_.get(), WGPUBufferBindingType_Uniform}};
+ {uniforms_buffer_.get(), WGPUBufferBindingType_Uniform}};
compute_pass_ = gpu_create_compute_pass(ctx_.device, particle_compute_wgsl,
compute_bindings, 2);
compute_pass_.workgroup_size_x = (NUM_PARTICLES + 63) / 64;
@@ -57,7 +55,7 @@ Particles::Particles(const GpuContext& ctx,
// Create render shader (particle rendering)
ResourceBinding render_bindings[] = {
{particles_buffer_, WGPUBufferBindingType_ReadOnlyStorage},
- {uniforms_.get(), WGPUBufferBindingType_Uniform}};
+ {uniforms_buffer_.get(), WGPUBufferBindingType_Uniform}};
render_pass_ =
gpu_create_render_pass(ctx_.device, WGPUTextureFormat_RGBA8Unorm,
particle_render_wgsl, render_bindings, 2);
@@ -69,7 +67,7 @@ void Particles::render(WGPUCommandEncoder encoder,
const UniformsSequenceParams& params,
NodeRegistry& nodes) {
// Update uniforms
- uniforms_.update(ctx_.queue, params);
+ uniforms_buffer_.update(ctx_.queue, params);
// Run compute pass (particle simulation)
WGPUComputePassEncoder compute =
@@ -84,12 +82,8 @@ void Particles::render(WGPUCommandEncoder encoder,
// Run render pass (draw particles to output)
WGPUTextureView output_view = nodes.get_view(output_nodes_[0]);
- WGPURenderPassColorAttachment color_attachment = {
- .view = output_view,
- .depthSlice = WGPU_DEPTH_SLICE_UNDEFINED,
- .loadOp = WGPULoadOp_Clear,
- .storeOp = WGPUStoreOp_Store,
- .clearValue = {0.0, 0.0, 0.0, 1.0}};
+ WGPURenderPassColorAttachment color_attachment = {};
+ gpu_init_color_attachment(color_attachment, output_view);
WGPURenderPassDescriptor render_desc = {
.colorAttachmentCount = 1, .colorAttachments = &color_attachment};
diff --git a/src/effects/particles_effect.h b/src/effects/particles_effect.h
index 38c60d7..e855b7b 100644
--- a/src/effects/particles_effect.h
+++ b/src/effects/particles_effect.h
@@ -30,5 +30,4 @@ class Particles : public Effect {
ComputePass compute_pass_;
RenderPass render_pass_;
GpuBuffer particles_buffer_;
- UniformBuffer<UniformsSequenceParams> uniforms_;
};
diff --git a/src/effects/passthrough_effect.cc b/src/effects/passthrough_effect.cc
index 392102d..24eefca 100644
--- a/src/effects/passthrough_effect.cc
+++ b/src/effects/passthrough_effect.cc
@@ -9,27 +9,14 @@ Passthrough::Passthrough(const GpuContext& ctx,
const std::vector<std::string>& inputs,
const std::vector<std::string>& outputs,
float start_time, float end_time)
- : Effect(ctx, inputs, outputs, start_time, end_time), pipeline_(nullptr),
- bind_group_(nullptr), sampler_(nullptr) {
- // Headless mode: skip GPU resource creation (compiled out in STRIP_ALL)
+ : Effect(ctx, inputs, outputs, start_time, end_time) {
HEADLESS_RETURN_IF_NULL(ctx_.device);
- // Init uniform buffer
- uniforms_buffer_.init(ctx_.device);
- // Create pipeline (simple version without effect params)
- pipeline_ = create_post_process_pipeline_simple(
- ctx_.device, WGPUTextureFormat_RGBA8Unorm, passthrough_shader_wgsl);
+ init_uniforms_buffer();
+ create_linear_sampler();
- // Create sampler
- 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_Nearest;
- sampler_desc.maxAnisotropy = 1;
- sampler_ = wgpuDeviceCreateSampler(ctx_.device, &sampler_desc);
+ pipeline_.set(create_post_process_pipeline_simple(
+ ctx_.device, WGPUTextureFormat_RGBA8Unorm, passthrough_shader_wgsl));
}
void Passthrough::render(WGPUCommandEncoder encoder,
@@ -45,7 +32,7 @@ void Passthrough::render(WGPUCommandEncoder encoder,
// Manually create bind group with only 3 entries (no effect params needed)
WGPUBindGroupEntry entries[3] = {};
entries[0].binding = PP_BINDING_SAMPLER;
- entries[0].sampler = sampler_;
+ entries[0].sampler = sampler_.get();
entries[1].binding = PP_BINDING_TEXTURE;
entries[1].textureView = input_view;
entries[2].binding = PP_BINDING_UNIFORMS;
@@ -53,22 +40,15 @@ void Passthrough::render(WGPUCommandEncoder encoder,
entries[2].size = sizeof(UniformsSequenceParams);
WGPUBindGroupDescriptor bg_desc = {};
- bg_desc.layout = wgpuRenderPipelineGetBindGroupLayout(pipeline_, 0);
+ bg_desc.layout = wgpuRenderPipelineGetBindGroupLayout(pipeline_.get(), 0);
bg_desc.entryCount = 3;
bg_desc.entries = entries;
- if (bind_group_) {
- wgpuBindGroupRelease(bind_group_);
- }
- bind_group_ = wgpuDeviceCreateBindGroup(ctx_.device, &bg_desc);
+ bind_group_.replace(wgpuDeviceCreateBindGroup(ctx_.device, &bg_desc));
// Render pass
- WGPURenderPassColorAttachment color_attachment = {
- .view = output_view,
- .depthSlice = WGPU_DEPTH_SLICE_UNDEFINED,
- .loadOp = WGPULoadOp_Clear,
- .storeOp = WGPUStoreOp_Store,
- .clearValue = {0.0, 0.0, 0.0, 1.0}};
+ WGPURenderPassColorAttachment color_attachment = {};
+ gpu_init_color_attachment(color_attachment, output_view);
WGPURenderPassDescriptor pass_desc = {};
pass_desc.colorAttachmentCount = 1;
@@ -76,8 +56,8 @@ void Passthrough::render(WGPUCommandEncoder encoder,
WGPURenderPassEncoder pass =
wgpuCommandEncoderBeginRenderPass(encoder, &pass_desc);
- wgpuRenderPassEncoderSetPipeline(pass, pipeline_);
- wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_, 0, nullptr);
+ wgpuRenderPassEncoderSetPipeline(pass, pipeline_.get());
+ wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_.get(), 0, nullptr);
wgpuRenderPassEncoderDraw(pass, 3, 1, 0, 0); // Fullscreen triangle
wgpuRenderPassEncoderEnd(pass);
wgpuRenderPassEncoderRelease(pass);
diff --git a/src/effects/passthrough_effect.h b/src/effects/passthrough_effect.h
index f684b9b..1c60e02 100644
--- a/src/effects/passthrough_effect.h
+++ b/src/effects/passthrough_effect.h
@@ -4,6 +4,7 @@
#include "gpu/effect.h"
#include "gpu/uniform_helper.h"
+#include "gpu/wgpu_resource.h"
class Passthrough : public Effect {
public:
@@ -15,8 +16,6 @@ class Passthrough : public Effect {
NodeRegistry& nodes) override;
private:
- WGPURenderPipeline pipeline_;
- WGPUBindGroup bind_group_;
- WGPUSampler sampler_;
- UniformBuffer<UniformsSequenceParams> uniforms_buffer_;
+ RenderPipeline pipeline_;
+ BindGroup bind_group_;
};
diff --git a/src/effects/peak_meter_effect.cc b/src/effects/peak_meter_effect.cc
index 63be2c0..d077302 100644
--- a/src/effects/peak_meter_effect.cc
+++ b/src/effects/peak_meter_effect.cc
@@ -12,7 +12,7 @@ PeakMeter::PeakMeter(const GpuContext& ctx,
: Effect(ctx, inputs, outputs, start_time, end_time), pipeline_(nullptr), bind_group_(nullptr) {
HEADLESS_RETURN_IF_NULL(ctx_.device);
- uniforms_buffer_.init(ctx_.device);
+ init_uniforms_buffer();
const char* shader_main = R"(
struct VertexOutput {
@@ -81,11 +81,8 @@ void PeakMeter::render(WGPUCommandEncoder encoder,
uniforms_buffer_.get(), {nullptr, 0});
WGPURenderPassColorAttachment color_attachment = {};
- color_attachment.view = output_view;
- color_attachment.depthSlice = WGPU_DEPTH_SLICE_UNDEFINED;
+ gpu_init_color_attachment(color_attachment, output_view);
color_attachment.loadOp = WGPULoadOp_Load;
- color_attachment.storeOp = WGPUStoreOp_Store;
- color_attachment.clearValue = {0.0, 0.0, 0.0, 1.0};
WGPURenderPassDescriptor pass_desc = {};
pass_desc.colorAttachmentCount = 1;
diff --git a/src/effects/peak_meter_effect.h b/src/effects/peak_meter_effect.h
index e397a71..1786522 100644
--- a/src/effects/peak_meter_effect.h
+++ b/src/effects/peak_meter_effect.h
@@ -18,5 +18,4 @@ class PeakMeter : public Effect {
private:
WGPURenderPipeline pipeline_;
WGPUBindGroup bind_group_;
- UniformBuffer<UniformsSequenceParams> uniforms_buffer_;
};
diff --git a/src/effects/placeholder_effect.cc b/src/effects/placeholder_effect.cc
index 6ba665a..e024a6b 100644
--- a/src/effects/placeholder_effect.cc
+++ b/src/effects/placeholder_effect.cc
@@ -12,26 +12,16 @@ Placeholder::Placeholder(const GpuContext& ctx,
float start_time, float end_time,
const char* placeholder_name)
: Effect(ctx, inputs, outputs, start_time, end_time), pipeline_(nullptr),
- bind_group_(nullptr), sampler_(nullptr), name_(placeholder_name) {
- // Log once on construction
+ bind_group_(nullptr), name_(placeholder_name) {
fprintf(stderr, "TODO: %s not yet implemented, using passthrough\n", name_);
- // Headless mode: skip GPU resource creation (compiled out in STRIP_ALL)
HEADLESS_RETURN_IF_NULL(ctx_.device);
- uniforms_buffer_.init(ctx_.device);
+ init_uniforms_buffer();
+ create_linear_sampler();
+
pipeline_ = create_post_process_pipeline(
ctx_.device, WGPUTextureFormat_RGBA8Unorm, passthrough_shader_wgsl);
-
- 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_Nearest;
- sampler_desc.maxAnisotropy = 1;
- sampler_ = wgpuDeviceCreateSampler(ctx_.device, &sampler_desc);
}
void Placeholder::render(WGPUCommandEncoder encoder,
@@ -45,12 +35,8 @@ void Placeholder::render(WGPUCommandEncoder encoder,
pp_update_bind_group(ctx_.device, pipeline_, &bind_group_, input_view,
uniforms_buffer_.get(), {nullptr, 0});
- WGPURenderPassColorAttachment color_attachment = {
- .view = output_view,
- .depthSlice = WGPU_DEPTH_SLICE_UNDEFINED,
- .loadOp = WGPULoadOp_Clear,
- .storeOp = WGPUStoreOp_Store,
- .clearValue = {0.0, 0.0, 0.0, 1.0}};
+ WGPURenderPassColorAttachment color_attachment = {};
+ gpu_init_color_attachment(color_attachment, output_view);
WGPURenderPassDescriptor pass_desc = {};
pass_desc.colorAttachmentCount = 1;
diff --git a/src/effects/placeholder_effect.h b/src/effects/placeholder_effect.h
index 24cf3f4..72b156f 100644
--- a/src/effects/placeholder_effect.h
+++ b/src/effects/placeholder_effect.h
@@ -18,7 +18,5 @@ class Placeholder : public Effect {
private:
WGPURenderPipeline pipeline_;
WGPUBindGroup bind_group_;
- WGPUSampler sampler_;
- UniformBuffer<UniformsSequenceParams> uniforms_buffer_;
const char* name_;
};
diff --git a/src/effects/rotating_cube_effect.cc b/src/effects/rotating_cube_effect.cc
index 0f1781d..6c350a7 100644
--- a/src/effects/rotating_cube_effect.cc
+++ b/src/effects/rotating_cube_effect.cc
@@ -163,9 +163,9 @@ void RotatingCube::render(WGPUCommandEncoder encoder,
WGPUTexture input_tex = nodes.get_texture(input_nodes_[0]);
WGPUTexture output_tex = nodes.get_texture(output_nodes_[0]);
if (input_tex && output_tex) {
- WGPUTexelCopyTextureInfo src = {
+ GpuTextureCopyInfo src = {
.texture = input_tex, .mipLevel = 0, .aspect = WGPUTextureAspect_All};
- WGPUTexelCopyTextureInfo dst = {.texture = output_tex,
+ GpuTextureCopyInfo dst = {.texture = output_tex,
.mipLevel = 0,
.aspect = WGPUTextureAspect_All};
WGPUExtent3D copy_size = {(uint32_t)params.resolution.x,
@@ -181,7 +181,9 @@ void RotatingCube::render(WGPUCommandEncoder encoder,
// Render pass with depth
WGPURenderPassColorAttachment color_attachment = {
.view = color_view,
+ #if !defined(DEMO_CROSS_COMPILE_WIN32)
.depthSlice = WGPU_DEPTH_SLICE_UNDEFINED,
+#endif
// .loadOp = WGPULoadOp_Clear,
.loadOp = WGPULoadOp_Load,
.storeOp = WGPUStoreOp_Store,
generated by cgit v1.2.3 (git 2.51.0) at 2026-02-17 14:28:25 +0000