summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/3d/test_3d_render.cc2
-rw-r--r--src/tests/assets/test_sequence.cc2
-rw-r--r--src/tests/common/effect_test_helpers.cc1
-rw-r--r--src/tests/gpu/test_demo_effects.cc63
-rw-r--r--src/tests/gpu/test_effect_base.cc22
-rw-r--r--src/tests/gpu/test_noise_functions.cc2
-rw-r--r--src/tests/gpu/test_sequence.cc21
-rw-r--r--src/tests/gpu/test_sequence_e2e.cc32
-rw-r--r--src/tests/gpu/test_shader_compilation.cc2
9 files changed, 66 insertions, 81 deletions
diff --git a/src/tests/3d/test_3d_render.cc b/src/tests/3d/test_3d_render.cc
index f802a40..bd301bd 100644
--- a/src/tests/3d/test_3d_render.cc
+++ b/src/tests/3d/test_3d_render.cc
@@ -7,8 +7,8 @@
#include "3d/renderer.h"
#include "3d/renderer_helpers.h"
#include "3d/scene.h"
-#include "generated/assets.h"
#include "effects/shaders.h"
+#include "generated/assets.h"
#include "gpu/texture_manager.h"
#include "platform/platform.h"
#include "procedural/generator.h"
diff --git a/src/tests/assets/test_sequence.cc b/src/tests/assets/test_sequence.cc
index 445e44b..8de9eca 100644
--- a/src/tests/assets/test_sequence.cc
+++ b/src/tests/assets/test_sequence.cc
@@ -179,7 +179,7 @@ int main() {
return 0;
}
-#else // v2 port TODO
+#else // v2 port TODO
int main() {
printf("test_sequence: SKIPPED (needs v2 port)\n");
return 0;
diff --git a/src/tests/common/effect_test_helpers.cc b/src/tests/common/effect_test_helpers.cc
index d776609..430b90f 100644
--- a/src/tests/common/effect_test_helpers.cc
+++ b/src/tests/common/effect_test_helpers.cc
@@ -66,4 +66,3 @@ uint64_t hash_pixels(const std::vector<uint8_t>& pixels) {
}
return hash;
}
-
diff --git a/src/tests/gpu/test_demo_effects.cc b/src/tests/gpu/test_demo_effects.cc
index d012afb..7f9d3da 100644
--- a/src/tests/gpu/test_demo_effects.cc
+++ b/src/tests/gpu/test_demo_effects.cc
@@ -37,42 +37,33 @@ static void test_effects() {
}
std::vector<std::pair<const char*, std::shared_ptr<Effect>>> effects = {
- {"Passthrough",
- std::make_shared<Passthrough>(
- fixture.ctx(), std::vector<std::string>{"source"},
- std::vector<std::string>{"sink"})},
- {"GaussianBlur",
- std::make_shared<GaussianBlur>(
- fixture.ctx(), std::vector<std::string>{"source"},
- std::vector<std::string>{"sink"})},
- {"Placeholder",
- std::make_shared<Placeholder>(
- fixture.ctx(), std::vector<std::string>{"source"},
- std::vector<std::string>{"sink"})},
- {"Heptagon",
- std::make_shared<Heptagon>(
- fixture.ctx(), std::vector<std::string>{"source"},
- std::vector<std::string>{"sink"})},
- {"Particles",
- std::make_shared<Particles>(
- fixture.ctx(), std::vector<std::string>{"source"},
- std::vector<std::string>{"sink"})},
- {"RotatingCube",
- std::make_shared<RotatingCube>(
- fixture.ctx(), std::vector<std::string>{"source"},
- std::vector<std::string>{"sink"})},
- {"Hybrid3D",
- std::make_shared<Hybrid3D>(
- fixture.ctx(), std::vector<std::string>{"source"},
- std::vector<std::string>{"sink"})},
- {"Flash",
- std::make_shared<Flash>(
- fixture.ctx(), std::vector<std::string>{"source"},
- std::vector<std::string>{"sink"})},
- {"PeakMeter",
- std::make_shared<PeakMeter>(
- fixture.ctx(), std::vector<std::string>{"source"},
- std::vector<std::string>{"sink"})},
+ {"Passthrough", std::make_shared<Passthrough>(
+ fixture.ctx(), std::vector<std::string>{"source"},
+ std::vector<std::string>{"sink"})},
+ {"GaussianBlur", std::make_shared<GaussianBlur>(
+ fixture.ctx(), std::vector<std::string>{"source"},
+ std::vector<std::string>{"sink"})},
+ {"Placeholder", std::make_shared<Placeholder>(
+ fixture.ctx(), std::vector<std::string>{"source"},
+ std::vector<std::string>{"sink"})},
+ {"Heptagon", std::make_shared<Heptagon>(
+ fixture.ctx(), std::vector<std::string>{"source"},
+ std::vector<std::string>{"sink"})},
+ {"Particles", std::make_shared<Particles>(
+ fixture.ctx(), std::vector<std::string>{"source"},
+ std::vector<std::string>{"sink"})},
+ {"RotatingCube", std::make_shared<RotatingCube>(
+ fixture.ctx(), std::vector<std::string>{"source"},
+ std::vector<std::string>{"sink"})},
+ {"Hybrid3D", std::make_shared<Hybrid3D>(
+ fixture.ctx(), std::vector<std::string>{"source"},
+ std::vector<std::string>{"sink"})},
+ {"Flash", std::make_shared<Flash>(fixture.ctx(),
+ std::vector<std::string>{"source"},
+ std::vector<std::string>{"sink"})},
+ {"PeakMeter", std::make_shared<PeakMeter>(
+ fixture.ctx(), std::vector<std::string>{"source"},
+ std::vector<std::string>{"sink"})},
};
int passed = 0;
diff --git a/src/tests/gpu/test_effect_base.cc b/src/tests/gpu/test_effect_base.cc
index ecf1dca..f46a4ef 100644
--- a/src/tests/gpu/test_effect_base.cc
+++ b/src/tests/gpu/test_effect_base.cc
@@ -102,11 +102,11 @@ static void test_effect_in_sequence() {
// Create minimal sequence with one effect
class TestSequence : public Sequence {
- public:
+ public:
TestSequence(const GpuContext& ctx, int w, int h) : Sequence(ctx, w, h) {
- auto effect = std::make_shared<Passthrough>(
- ctx, std::vector<std::string>{"source"},
- std::vector<std::string>{"sink"});
+ auto effect =
+ std::make_shared<Passthrough>(ctx, std::vector<std::string>{"source"},
+ std::vector<std::string>{"sink"});
effect_dag_.push_back({effect, {"source"}, {"sink"}, 0});
init_effect_nodes();
@@ -134,11 +134,11 @@ static void test_sequence_render() {
OffscreenRenderTarget target(fixture.instance(), fixture.device(), 256, 256);
class TestSequence : public Sequence {
- public:
+ public:
TestSequence(const GpuContext& ctx, int w, int h) : Sequence(ctx, w, h) {
- auto effect = std::make_shared<Passthrough>(
- ctx, std::vector<std::string>{"source"},
- std::vector<std::string>{"sink"});
+ auto effect =
+ std::make_shared<Passthrough>(ctx, std::vector<std::string>{"source"},
+ std::vector<std::string>{"sink"});
effect_dag_.push_back({effect, {"source"}, {"sink"}, 0});
init_effect_nodes();
@@ -154,8 +154,8 @@ static void test_sequence_render() {
seq->preprocess(0.0f, 0.0f, 0.0f, 0.0f);
// Create encoder and attempt render
- WGPUCommandEncoder encoder = wgpuDeviceCreateCommandEncoder(
- fixture.device(), nullptr);
+ WGPUCommandEncoder encoder =
+ wgpuDeviceCreateCommandEncoder(fixture.device(), nullptr);
seq->render_effects(encoder);
@@ -177,7 +177,7 @@ static void test_sequence_time_params() {
}
class TestSequence : public Sequence {
- public:
+ public:
TestSequence(const GpuContext& ctx, int w, int h) : Sequence(ctx, w, h) {
init_effect_nodes();
}
diff --git a/src/tests/gpu/test_noise_functions.cc b/src/tests/gpu/test_noise_functions.cc
index 4e1791f..d96a982 100644
--- a/src/tests/gpu/test_noise_functions.cc
+++ b/src/tests/gpu/test_noise_functions.cc
@@ -1,9 +1,9 @@
// This file is part of the 64k demo project.
// It validates that the noise.wgsl functions are accessible and usable.
+#include "effects/shaders.h"
#include "generated/assets.h"
#include "gpu/shader_composer.h"
-#include "effects/shaders.h"
#include <cassert>
#include <cstdio>
#include <cstring>
diff --git a/src/tests/gpu/test_sequence.cc b/src/tests/gpu/test_sequence.cc
index 337381a..fa6bd5e 100644
--- a/src/tests/gpu/test_sequence.cc
+++ b/src/tests/gpu/test_sequence.cc
@@ -1,8 +1,8 @@
// Test file for Sequence v2 system
// Phase 1: Foundation tests (NodeRegistry, Sequence base class)
-#include "gpu/sequence.h"
#include "gpu/effect.h"
+#include "gpu/sequence.h"
#include "tests/common/webgpu_test_fixture.h"
#include <cassert>
#include <cstdio>
@@ -11,7 +11,7 @@
class TestEffect : public Effect {
public:
TestEffect(const GpuContext& ctx, const std::vector<std::string>& inputs,
- const std::vector<std::string>& outputs)
+ const std::vector<std::string>& outputs)
: Effect(ctx, inputs, outputs), render_called_(false) {
}
@@ -132,16 +132,15 @@ void test_sequence_v2_dag_execution() {
class TestSequence : public Sequence {
public:
TestSequence(const GpuContext& ctx)
- : Sequence(ctx, 1280, 720),
- effect1_(std::make_shared<TestEffect>(ctx, std::vector<std::string>{"source"},
- std::vector<std::string>{"temp"})),
- effect2_(std::make_shared<TestEffect>(ctx, std::vector<std::string>{"temp"},
- std::vector<std::string>{"sink"})) {
+ : Sequence(ctx, 1280, 720), effect1_(std::make_shared<TestEffect>(
+ ctx, std::vector<std::string>{"source"},
+ 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(
- {effect1_, {"source"}, {"temp"}, 0});
- effect_dag_.push_back(
- {effect2_, {"temp"}, {"sink"}, 1});
+ effect_dag_.push_back({effect1_, {"source"}, {"temp"}, 0});
+ effect_dag_.push_back({effect2_, {"temp"}, {"sink"}, 1});
}
std::shared_ptr<TestEffect> effect1_;
diff --git a/src/tests/gpu/test_sequence_e2e.cc b/src/tests/gpu/test_sequence_e2e.cc
index 6ae82bd..ed8920a 100644
--- a/src/tests/gpu/test_sequence_e2e.cc
+++ b/src/tests/gpu/test_sequence_e2e.cc
@@ -1,12 +1,12 @@
// End-to-end test for Sequence v2 system
// Tests compiler output instantiation and execution
-#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 "effects/shaders.h"
+#include "gpu/effect.h"
+#include "gpu/sequence.h"
#include "tests/common/webgpu_test_fixture.h"
#include <cassert>
#include <cstdio>
@@ -21,22 +21,18 @@ class SimpleTestSequence : public Sequence {
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<Passthrough>(ctx,
- std::vector<std::string>{"source"},
- std::vector<std::string>{"temp"}),
- .input_nodes = {"source"},
- .output_nodes = {"temp"},
- .execution_order = 0
- });
- effect_dag_.push_back({
- .effect = std::make_shared<Passthrough>(ctx,
- std::vector<std::string>{"temp"},
- std::vector<std::string>{"sink"}),
- .input_nodes = {"temp"},
- .output_nodes = {"sink"},
- .execution_order = 1
- });
+ effect_dag_.push_back({.effect = std::make_shared<Passthrough>(
+ ctx, std::vector<std::string>{"source"},
+ std::vector<std::string>{"temp"}),
+ .input_nodes = {"source"},
+ .output_nodes = {"temp"},
+ .execution_order = 0});
+ effect_dag_.push_back({.effect = std::make_shared<Passthrough>(
+ ctx, std::vector<std::string>{"temp"},
+ std::vector<std::string>{"sink"}),
+ .input_nodes = {"temp"},
+ .output_nodes = {"sink"},
+ .execution_order = 1});
}
};
diff --git a/src/tests/gpu/test_shader_compilation.cc b/src/tests/gpu/test_shader_compilation.cc
index 3f2219d..2aff115 100644
--- a/src/tests/gpu/test_shader_compilation.cc
+++ b/src/tests/gpu/test_shader_compilation.cc
@@ -5,9 +5,9 @@
// - Missing binding declarations
// - Type mismatches
+#include "effects/shaders.h"
#include "generated/assets.h"
#include "gpu/shader_composer.h"
-#include "effects/shaders.h"
#include "platform/platform.h"
#include <cassert>
#include <cstdio>