diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/effects/shaders.cc | 2 | ||||
| -rw-r--r-- | src/effects/shaders.h | 4 | ||||
| -rw-r--r-- | src/gpu/demo_effects.h | 3 | ||||
| -rw-r--r-- | src/tests/gpu/test_demo_effects.cc | 5 |
4 files changed, 14 insertions, 0 deletions
diff --git a/src/effects/shaders.cc b/src/effects/shaders.cc index 8a81bb0..1adbff5 100644 --- a/src/effects/shaders.cc +++ b/src/effects/shaders.cc @@ -107,6 +107,8 @@ const char* scene2_shader_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_SCENE2); const char* scratch_shader_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_SCRATCH); const char* ntsc_rgb_shader_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_NTSC_RGB); const char* ntsc_yiq_shader_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_NTSC_YIQ); +const char* gbuf_raster_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_GBUF_RASTER); +const char* gbuf_pack_wgsl = SafeGetAsset(AssetId::ASSET_SHADER_GBUF_PACK); // Compute shaders const char* gen_noise_compute_wgsl = diff --git a/src/effects/shaders.h b/src/effects/shaders.h index 527a8a3..cf095fb 100644 --- a/src/effects/shaders.h +++ b/src/effects/shaders.h @@ -20,6 +20,10 @@ extern const char* scratch_shader_wgsl; extern const char* ntsc_rgb_shader_wgsl; extern const char* ntsc_yiq_shader_wgsl; +// CNN v3 G-buffer shaders +extern const char* gbuf_raster_wgsl; +extern const char* gbuf_pack_wgsl; + // Compute shaders extern const char* gen_noise_compute_wgsl; extern const char* gen_perlin_compute_wgsl; diff --git a/src/gpu/demo_effects.h b/src/gpu/demo_effects.h index 9d794aa..91ab6f2 100644 --- a/src/gpu/demo_effects.h +++ b/src/gpu/demo_effects.h @@ -32,6 +32,9 @@ #include "effects/scratch_effect.h" #include "effects/ntsc_effect.h" +// CNN v3 G-buffer +#include "../../cnn_v3/src/gbuffer_effect.h" + // TODO: Port CNN effects // #include "../../cnn_v1/src/cnn_v1_effect.h" // #include "../../cnn_v2/src/cnn_v2_effect.h" diff --git a/src/tests/gpu/test_demo_effects.cc b/src/tests/gpu/test_demo_effects.cc index 9d8cb7d..c2588f2 100644 --- a/src/tests/gpu/test_demo_effects.cc +++ b/src/tests/gpu/test_demo_effects.cc @@ -79,6 +79,11 @@ static void test_effects() { {"NtscYiq", std::make_shared<NtscYiq>( fixture.ctx(), std::vector<std::string>{"source"}, std::vector<std::string>{"sink"}, 0.0f, 1000.0f)}, + {"GBufferEffect", + std::make_shared<GBufferEffect>( + fixture.ctx(), std::vector<std::string>{"source"}, + std::vector<std::string>{"gbuf_feat0", "gbuf_feat1"}, 0.0f, + 1000.0f)}, }; int passed = 0; |
