From 9bf9b0aa0573f77bd667e6976a8bb413153daa1d Mon Sep 17 00:00:00 2001 From: skal Date: Sun, 22 Mar 2026 19:58:04 +0100 Subject: feat(cnn_v3): GBufDeferredEffect — simple deferred render (albedo * shadow) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New effect unpacks feat_tex0/feat_tex1 and outputs albedo * shadow. Replaces CNNv3Effect in cnn_v3_test sequence until training is complete. 37/37 tests passing. handoff(Gemini): GBufDeferredEffect wired in timeline; CNN v3 pipeline: GBufferEffect → GBufDeferredEffect → sink. --- src/effects/shaders.cc | 1 + src/effects/shaders.h | 1 + src/gpu/demo_effects.h | 1 + src/tests/gpu/test_demo_effects.cc | 5 +++++ 4 files changed, 8 insertions(+) (limited to 'src') diff --git a/src/effects/shaders.cc b/src/effects/shaders.cc index a74d920..7a68e5f 100644 --- a/src/effects/shaders.cc +++ b/src/effects/shaders.cc @@ -119,6 +119,7 @@ const char* gbuf_raster_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_GBUF_RASTE const char* gbuf_pack_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_GBUF_PACK); const char* gbuf_shadow_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_GBUF_SHADOW); const char* gbuf_view_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_GBUF_VIEW); +const char* gbuf_deferred_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_GBUF_DEFERRED); const char* cnn_v3_enc0_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_CNN_V3_ENC0); const char* cnn_v3_enc1_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_CNN_V3_ENC1); const char* cnn_v3_bottleneck_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_CNN_V3_BOTTLENECK); diff --git a/src/effects/shaders.h b/src/effects/shaders.h index 1664706..7e1cf02 100644 --- a/src/effects/shaders.h +++ b/src/effects/shaders.h @@ -25,6 +25,7 @@ extern const char* gbuf_raster_wgsl; extern const char* gbuf_pack_wgsl; extern const char* gbuf_shadow_wgsl; extern const char* gbuf_view_wgsl; +extern const char* gbuf_deferred_wgsl; // CNN v3 inference shaders extern const char* cnn_v3_enc0_wgsl; diff --git a/src/gpu/demo_effects.h b/src/gpu/demo_effects.h index edb4a23..77e5c76 100644 --- a/src/gpu/demo_effects.h +++ b/src/gpu/demo_effects.h @@ -36,6 +36,7 @@ #include "../../cnn_v3/src/gbuffer_effect.h" #include "../../cnn_v3/src/cnn_v3_effect.h" #include "../../cnn_v3/src/gbuf_view_effect.h" +#include "../../cnn_v3/src/gbuf_deferred_effect.h" // TODO: Port CNN effects // #include "../../cnn_v1/src/cnn_v1_effect.h" diff --git a/src/tests/gpu/test_demo_effects.cc b/src/tests/gpu/test_demo_effects.cc index d6e9c8a..1bb89f9 100644 --- a/src/tests/gpu/test_demo_effects.cc +++ b/src/tests/gpu/test_demo_effects.cc @@ -94,6 +94,11 @@ static void test_effects() { fixture.ctx(), std::vector{"gbuf_feat0", "gbuf_feat1"}, std::vector{"gbuf_view_out"}, 0.0f, 1000.0f)}, + {"GBufDeferredEffect", + std::make_shared( + fixture.ctx(), + std::vector{"gbuf_feat0", "gbuf_feat1"}, + std::vector{"gbuf_deferred_out"}, 0.0f, 1000.0f)}, }; int passed = 0; -- cgit v1.2.3