diff options
| author | skal <pascal.massimino@gmail.com> | 2026-02-16 14:32:59 +0100 |
|---|---|---|
| committer | skal <pascal.massimino@gmail.com> | 2026-02-16 14:32:59 +0100 |
| commit | b2ede3f0680edc894a54e28374cb87ab2690afa2 (patch) | |
| tree | 69e0a8c04eb29be953b037eb98e0a9ac0f1b417a /src/tests | |
| parent | 0fd3c982247d05bacbd67db08c865ec67602437f (diff) | |
refactor: remove v2 versioning artifacts, establish Sequence as canonical system
Complete v1→v2 migration cleanup: rename 29 files (sequence_v2→sequence, effect_v2→effect, 14 effect files, 8 shaders, compiler, docs), update all class names and references across 54 files. Archive v1 timeline. System now uses standard naming with all versioning removed. 30/34 tests passing.
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/gpu/test_demo_effects.cc | 38 | ||||
| -rw-r--r-- | src/tests/gpu/test_effect_base.cc | 34 | ||||
| -rw-r--r-- | src/tests/gpu/test_sequence.cc (renamed from src/tests/gpu/test_sequence_v2.cc) | 34 | ||||
| -rw-r--r-- | src/tests/gpu/test_sequence_e2e.cc (renamed from src/tests/gpu/test_sequence_v2_e2e.cc) | 18 |
4 files changed, 62 insertions, 62 deletions
diff --git a/src/tests/gpu/test_demo_effects.cc b/src/tests/gpu/test_demo_effects.cc index 02aee78..7bba831 100644 --- a/src/tests/gpu/test_demo_effects.cc +++ b/src/tests/gpu/test_demo_effects.cc @@ -14,7 +14,7 @@ #include <vector> // Helper: Test v2 effect construction -static int test_effect_v2(const char* name, std::shared_ptr<EffectV2> effect) { +static int test_effect(const char* name, std::shared_ptr<Effect> effect) { fprintf(stdout, " Testing %s...\n", name); if (!effect) { @@ -27,7 +27,7 @@ static int test_effect_v2(const char* name, std::shared_ptr<EffectV2> effect) { } // Test all available v2 effects -static void test_v2_effects() { +static void test_effects() { fprintf(stdout, "Testing V2 effects...\n"); WebGPUTestFixture fixture; @@ -36,40 +36,40 @@ static void test_v2_effects() { return; } - std::vector<std::pair<const char*, std::shared_ptr<EffectV2>>> effects = { - {"PassthroughEffectV2", - std::make_shared<PassthroughEffectV2>( + std::vector<std::pair<const char*, std::shared_ptr<Effect>>> effects = { + {"PassthroughEffect", + std::make_shared<PassthroughEffect>( fixture.ctx(), std::vector<std::string>{"source"}, std::vector<std::string>{"sink"})}, - {"GaussianBlurEffectV2", - std::make_shared<GaussianBlurEffectV2>( + {"GaussianBlurEffect", + std::make_shared<GaussianBlurEffect>( fixture.ctx(), std::vector<std::string>{"source"}, std::vector<std::string>{"sink"})}, - {"PlaceholderEffectV2", - std::make_shared<PlaceholderEffectV2>( + {"PlaceholderEffect", + std::make_shared<PlaceholderEffect>( fixture.ctx(), std::vector<std::string>{"source"}, std::vector<std::string>{"sink"})}, - {"HeptagonEffectV2", - std::make_shared<HeptagonEffectV2>( + {"HeptagonEffect", + std::make_shared<HeptagonEffect>( fixture.ctx(), std::vector<std::string>{"source"}, std::vector<std::string>{"sink"})}, - {"ParticlesEffectV2", - std::make_shared<ParticlesEffectV2>( + {"ParticlesEffect", + std::make_shared<ParticlesEffect>( fixture.ctx(), std::vector<std::string>{"source"}, std::vector<std::string>{"sink"})}, - {"RotatingCubeEffectV2", - std::make_shared<RotatingCubeEffectV2>( + {"RotatingCubeEffect", + std::make_shared<RotatingCubeEffect>( fixture.ctx(), std::vector<std::string>{"source"}, std::vector<std::string>{"sink"})}, - {"Hybrid3DEffectV2", - std::make_shared<Hybrid3DEffectV2>( + {"Hybrid3DEffect", + std::make_shared<Hybrid3DEffect>( fixture.ctx(), std::vector<std::string>{"source"}, std::vector<std::string>{"sink"})}, }; int passed = 0; for (const auto& [name, effect] : effects) { - passed += test_effect_v2(name, effect); + passed += test_effect(name, effect); } fprintf(stdout, " ✓ %d/%zu V2 effects tested\n", passed, effects.size()); @@ -81,7 +81,7 @@ int main() { extern void InitShaderComposer(); InitShaderComposer(); - test_v2_effects(); + test_effects(); fprintf(stdout, "=== All Tests Passed ===\n"); return 0; diff --git a/src/tests/gpu/test_effect_base.cc b/src/tests/gpu/test_effect_base.cc index ddccad4..8b0e6b2 100644 --- a/src/tests/gpu/test_effect_base.cc +++ b/src/tests/gpu/test_effect_base.cc @@ -1,13 +1,13 @@ // This file is part of the 64k demo project. -// It tests the EffectV2/SequenceV2 lifecycle using headless rendering. +// It tests the Effect/Sequence lifecycle using headless rendering. // Verifies effect initialization and basic rendering. #include "../common/effect_test_helpers.h" #include "../common/offscreen_render_target.h" #include "../common/webgpu_test_fixture.h" -#include "effects/passthrough_effect_v2.h" -#include "gpu/effect_v2.h" -#include "gpu/sequence_v2.h" +#include "effects/passthrough_effect.h" +#include "gpu/effect.h" +#include "gpu/sequence.h" #include <cassert> #include <cstdio> #include <memory> @@ -80,19 +80,19 @@ static void test_effect_construction() { return; } - // Create PassthroughEffectV2 (simple effect) - auto effect = std::make_shared<PassthroughEffectV2>( + // Create PassthroughEffect (simple effect) + auto effect = std::make_shared<PassthroughEffect>( fixture.ctx(), std::vector<std::string>{"source"}, std::vector<std::string>{"sink"}); assert(effect != nullptr && "Effect should be constructed"); - fprintf(stdout, " ✓ PassthroughEffectV2 constructed\n"); + fprintf(stdout, " ✓ PassthroughEffect constructed\n"); } // Test 4: Effect added to sequence DAG static void test_effect_in_sequence() { - fprintf(stdout, "Testing effect in SequenceV2 DAG...\n"); + fprintf(stdout, "Testing effect in Sequence DAG...\n"); WebGPUTestFixture fixture; if (!fixture.init()) { @@ -101,10 +101,10 @@ static void test_effect_in_sequence() { } // Create minimal sequence with one effect - class TestSequence : public SequenceV2 { + class TestSequence : public Sequence { public: - TestSequence(const GpuContext& ctx, int w, int h) : SequenceV2(ctx, w, h) { - auto effect = std::make_shared<PassthroughEffectV2>( + TestSequence(const GpuContext& ctx, int w, int h) : Sequence(ctx, w, h) { + auto effect = std::make_shared<PassthroughEffect>( ctx, std::vector<std::string>{"source"}, std::vector<std::string>{"sink"}); @@ -133,10 +133,10 @@ static void test_sequence_render() { OffscreenRenderTarget target(fixture.instance(), fixture.device(), 256, 256); - class TestSequence : public SequenceV2 { + class TestSequence : public Sequence { public: - TestSequence(const GpuContext& ctx, int w, int h) : SequenceV2(ctx, w, h) { - auto effect = std::make_shared<PassthroughEffectV2>( + TestSequence(const GpuContext& ctx, int w, int h) : Sequence(ctx, w, h) { + auto effect = std::make_shared<PassthroughEffect>( ctx, std::vector<std::string>{"source"}, std::vector<std::string>{"sink"}); @@ -176,15 +176,15 @@ static void test_sequence_time_params() { return; } - class TestSequence : public SequenceV2 { + class TestSequence : public Sequence { public: - TestSequence(const GpuContext& ctx, int w, int h) : SequenceV2(ctx, w, h) { + TestSequence(const GpuContext& ctx, int w, int h) : Sequence(ctx, w, h) { init_effect_nodes(); } void preprocess(float seq_time, float beat_time, float beat_phase, float audio_intensity) override { - SequenceV2::preprocess(seq_time, beat_time, beat_phase, audio_intensity); + Sequence::preprocess(seq_time, beat_time, beat_phase, audio_intensity); last_time = seq_time; } diff --git a/src/tests/gpu/test_sequence_v2.cc b/src/tests/gpu/test_sequence.cc index 54b544e..337381a 100644 --- a/src/tests/gpu/test_sequence_v2.cc +++ b/src/tests/gpu/test_sequence.cc @@ -1,18 +1,18 @@ // Test file for Sequence v2 system -// Phase 1: Foundation tests (NodeRegistry, SequenceV2 base class) +// Phase 1: Foundation tests (NodeRegistry, Sequence base class) -#include "gpu/sequence_v2.h" -#include "gpu/effect_v2.h" +#include "gpu/sequence.h" +#include "gpu/effect.h" #include "tests/common/webgpu_test_fixture.h" #include <cassert> #include <cstdio> // Simple test effect for DAG execution -class TestEffectV2 : public EffectV2 { +class TestEffect : public Effect { public: - TestEffectV2(const GpuContext& ctx, const std::vector<std::string>& inputs, + TestEffect(const GpuContext& ctx, const std::vector<std::string>& inputs, const std::vector<std::string>& outputs) - : EffectV2(ctx, inputs, outputs), render_called_(false) { + : Effect(ctx, inputs, outputs), render_called_(false) { } void render(WGPUCommandEncoder encoder, const UniformsSequenceParams& params, @@ -103,7 +103,7 @@ void test_node_registry_multi_output() { printf("PASS: NodeRegistry multi-output views\n"); } -// Test: SequenceV2 default preprocess +// Test: Sequence default preprocess void test_sequence_v2_preprocess() { WebGPUTestFixture fixture; if (!fixture.init()) { @@ -111,16 +111,16 @@ void test_sequence_v2_preprocess() { return; } - SequenceV2 seq(fixture.ctx(), 1280, 720); + Sequence seq(fixture.ctx(), 1280, 720); // Call preprocess with test values seq.preprocess(1.0f, 4.0f, 0.5f, 0.8f); // No crash = success (params updated internally) - printf("PASS: SequenceV2 preprocess\n"); + printf("PASS: Sequence preprocess\n"); } -// Test: SequenceV2 DAG execution +// Test: Sequence DAG execution void test_sequence_v2_dag_execution() { WebGPUTestFixture fixture; if (!fixture.init()) { @@ -129,13 +129,13 @@ void test_sequence_v2_dag_execution() { } // Create sequence - class TestSequence : public SequenceV2 { + class TestSequence : public Sequence { public: TestSequence(const GpuContext& ctx) - : SequenceV2(ctx, 1280, 720), - effect1_(std::make_shared<TestEffectV2>(ctx, std::vector<std::string>{"source"}, + : Sequence(ctx, 1280, 720), + effect1_(std::make_shared<TestEffect>(ctx, std::vector<std::string>{"source"}, std::vector<std::string>{"temp"})), - effect2_(std::make_shared<TestEffectV2>(ctx, std::vector<std::string>{"temp"}, + effect2_(std::make_shared<TestEffect>(ctx, std::vector<std::string>{"temp"}, std::vector<std::string>{"sink"})) { // Build DAG (2 effects in sequence) effect_dag_.push_back( @@ -144,8 +144,8 @@ void test_sequence_v2_dag_execution() { {effect2_, {"temp"}, {"sink"}, 1}); } - std::shared_ptr<TestEffectV2> effect1_; - std::shared_ptr<TestEffectV2> effect2_; + std::shared_ptr<TestEffect> effect1_; + std::shared_ptr<TestEffect> effect2_; }; TestSequence seq(fixture.ctx()); @@ -167,7 +167,7 @@ void test_sequence_v2_dag_execution() { wgpuCommandBufferRelease(cmd); wgpuCommandEncoderRelease(encoder); - printf("PASS: SequenceV2 DAG execution\n"); + printf("PASS: Sequence DAG execution\n"); } int main() { diff --git a/src/tests/gpu/test_sequence_v2_e2e.cc b/src/tests/gpu/test_sequence_e2e.cc index c015e0b..91a8da2 100644 --- a/src/tests/gpu/test_sequence_v2_e2e.cc +++ b/src/tests/gpu/test_sequence_e2e.cc @@ -1,11 +1,11 @@ // End-to-end test for Sequence v2 system // Tests compiler output instantiation and execution -#include "gpu/sequence_v2.h" -#include "gpu/effect_v2.h" -#include "effects/gaussian_blur_effect_v2.h" -#include "effects/heptagon_effect_v2.h" -#include "effects/passthrough_effect_v2.h" +#include "gpu/sequence.h" +#include "gpu/effect.h" +#include "effects/gaussian_blur_effect.h" +#include "effects/heptagon_effect.h" +#include "effects/passthrough_effect.h" #include "gpu/shaders.h" #include "tests/common/webgpu_test_fixture.h" #include <cassert> @@ -13,16 +13,16 @@ // Manually transcribed generated sequence (simulates compiler output) // Simple 2-effect chain to validate DAG execution -class SimpleTestSequence : public SequenceV2 { +class SimpleTestSequence : public Sequence { public: SimpleTestSequence(const GpuContext& ctx, int width, int height) - : SequenceV2(ctx, width, height) { + : Sequence(ctx, width, height) { // Node declarations (source/sink already created by NodeRegistry) nodes_.declare_node("temp", NodeType::U8X4_NORM, width_, height_); // Effect DAG construction (2 effects: source->temp->sink) effect_dag_.push_back({ - .effect = std::make_shared<PassthroughEffectV2>(ctx, + .effect = std::make_shared<PassthroughEffect>(ctx, std::vector<std::string>{"source"}, std::vector<std::string>{"temp"}), .input_nodes = {"source"}, @@ -30,7 +30,7 @@ class SimpleTestSequence : public SequenceV2 { .execution_order = 0 }); effect_dag_.push_back({ - .effect = std::make_shared<PassthroughEffectV2>(ctx, + .effect = std::make_shared<PassthroughEffect>(ctx, std::vector<std::string>{"temp"}, std::vector<std::string>{"sink"}), .input_nodes = {"temp"}, |
