summaryrefslogtreecommitdiff
path: root/src/effects
diff options
context:
space:
mode:
Diffstat (limited to 'src/effects')
-rw-r--r--src/effects/scene2_effect.cc34
-rw-r--r--src/effects/scene2_effect.h19
2 files changed, 7 insertions, 46 deletions
diff --git a/src/effects/scene2_effect.cc b/src/effects/scene2_effect.cc
deleted file mode 100644
index 92e5ecd..0000000
--- a/src/effects/scene2_effect.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// This file is part of the 64k demo project.
-// Scene2 effect - ShaderToy conversion (scene)
-// Generated by convert_shadertoy.py
-
-#include "effects/scene2_effect.h"
-#include "effects/shaders.h"
-#include "gpu/gpu.h"
-#include "gpu/post_process_helper.h"
-#include "util/fatal_error.h"
-
-Scene2Effect::Scene2Effect(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) {
- HEADLESS_RETURN_IF_NULL(ctx_.device);
- create_nearest_sampler();
- create_dummy_scene_texture();
- pipeline_.set(create_post_process_pipeline(
- ctx_.device, WGPUTextureFormat_RGBA8Unorm, scene2_shader_wgsl));
-}
-
-void Scene2Effect::render(WGPUCommandEncoder encoder,
- const UniformsSequenceParams& params,
- NodeRegistry& nodes) {
- WGPUTextureView output_view = nodes.get_view(output_nodes_[0]);
-
- // uniforms_buffer_ auto-updated by base class dispatch_render()
- pp_update_bind_group(ctx_.device, pipeline_.get(), bind_group_.get_address(),
- dummy_texture_view_.get(), uniforms_buffer_.get(),
- {nullptr, 0});
-
- run_fullscreen_pass(encoder, pipeline_.get(), bind_group_.get(), output_view);
-}
diff --git a/src/effects/scene2_effect.h b/src/effects/scene2_effect.h
index da4cf7e..0e26fc3 100644
--- a/src/effects/scene2_effect.h
+++ b/src/effects/scene2_effect.h
@@ -4,19 +4,14 @@
#pragma once
-#include "gpu/effect.h"
-#include "gpu/wgpu_resource.h"
+#include "effects/shaders.h"
+#include "gpu/wgsl_effect.h"
-class Scene2Effect : public Effect {
- public:
+struct Scene2Effect : public WgslEffect {
Scene2Effect(const GpuContext& ctx, const std::vector<std::string>& inputs,
const std::vector<std::string>& outputs, float start_time,
- float end_time);
-
- void render(WGPUCommandEncoder encoder, const UniformsSequenceParams& params,
- NodeRegistry& nodes) override;
-
- private:
- RenderPipeline pipeline_;
- BindGroup bind_group_;
+ float end_time)
+ : WgslEffect(ctx, inputs, outputs, start_time, end_time,
+ scene2_shader_wgsl, WGPULoadOp_Clear, {},
+ WgslSamplerType::Nearest) {}
};