diff --git a/examples/xx-denoise/denoise.cpp b/examples/43-denoise/denoise.cpp similarity index 99% rename from examples/xx-denoise/denoise.cpp rename to examples/43-denoise/denoise.cpp index e7abb1ee7..8d0680a82 100644 --- a/examples/xx-denoise/denoise.cpp +++ b/examples/43-denoise/denoise.cpp @@ -286,7 +286,7 @@ public: // Create program from shaders. m_gbufferProgram = loadProgram("vs_denoise_gbuffer", "fs_denoise_gbuffer"); // Fill gbuffer m_combineProgram = loadProgram("vs_denoise_screenquad", "fs_denoise_deferred_combine"); // Compute lighting from gbuffer - m_copyProgram = loadProgram("vs_denoise_screenquad", "fs_denoise_copy"); + m_copyProgram = loadProgram("vs_denoise_screenquad", "fs_denoise_copy"); m_denoiseTemporalProgram = loadProgram("vs_denoise_screenquad", "fs_denoise_temporal"); m_denoiseSpatialProgram3x3 = loadProgram("vs_denoise_screenquad", "fs_denoise_spatial_3x3"); m_denoiseSpatialProgram5x5 = loadProgram("vs_denoise_screenquad", "fs_denoise_spatial_5x5"); @@ -319,7 +319,7 @@ public: m_recreateFrameBuffers = false; createFramebuffers(); - + // Vertex decl PosTexCoord0Vertex::init(); @@ -519,7 +519,7 @@ public: lastTex = m_temporaryColor.m_texture; } - + // denoise spatial passes if (0 < m_denoisePasses) { @@ -532,7 +532,7 @@ public: m_temporaryColor.m_buffer, m_currentColor.m_buffer }; - + uint32_t denoisePasses = bx::min(DENOISE_MAX_PASSES, m_denoisePasses); for (uint32_t i = 0; i < denoisePasses; ++i) { @@ -638,7 +638,7 @@ public: bgfx::submit(view, m_txaaProgram); ++view; } - + // Copy txaa result to previous { bgfx::setViewName(view, "copy2previous"); @@ -715,7 +715,7 @@ public: // update previous status m_havePrevious = true; - } + } // Copy matrices for next time mat4Set(m_worldToViewPrev, m_view); @@ -1072,4 +1072,4 @@ public: } // namespace -ENTRY_IMPLEMENT_MAIN(ExampleDenoise, "xx-denoise", "Denoise."); +ENTRY_IMPLEMENT_MAIN(ExampleDenoise, "43-denoise", "Denoise."); diff --git a/examples/xx-denoise/fs_denoise_apply_lighting.sc b/examples/43-denoise/fs_denoise_apply_lighting.sc similarity index 100% rename from examples/xx-denoise/fs_denoise_apply_lighting.sc rename to examples/43-denoise/fs_denoise_apply_lighting.sc diff --git a/examples/xx-denoise/fs_denoise_copy.sc b/examples/43-denoise/fs_denoise_copy.sc similarity index 100% rename from examples/xx-denoise/fs_denoise_copy.sc rename to examples/43-denoise/fs_denoise_copy.sc diff --git a/examples/xx-denoise/fs_denoise_deferred_combine.sc b/examples/43-denoise/fs_denoise_deferred_combine.sc similarity index 100% rename from examples/xx-denoise/fs_denoise_deferred_combine.sc rename to examples/43-denoise/fs_denoise_deferred_combine.sc diff --git a/examples/xx-denoise/fs_denoise_gbuffer.sc b/examples/43-denoise/fs_denoise_gbuffer.sc similarity index 100% rename from examples/xx-denoise/fs_denoise_gbuffer.sc rename to examples/43-denoise/fs_denoise_gbuffer.sc diff --git a/examples/xx-denoise/fs_denoise_spatial_3x3.sc b/examples/43-denoise/fs_denoise_spatial_3x3.sc similarity index 100% rename from examples/xx-denoise/fs_denoise_spatial_3x3.sc rename to examples/43-denoise/fs_denoise_spatial_3x3.sc diff --git a/examples/xx-denoise/fs_denoise_spatial_5x5.sc b/examples/43-denoise/fs_denoise_spatial_5x5.sc similarity index 100% rename from examples/xx-denoise/fs_denoise_spatial_5x5.sc rename to examples/43-denoise/fs_denoise_spatial_5x5.sc diff --git a/examples/xx-denoise/fs_denoise_spatial_implementation.sh b/examples/43-denoise/fs_denoise_spatial_implementation.sh similarity index 100% rename from examples/xx-denoise/fs_denoise_spatial_implementation.sh rename to examples/43-denoise/fs_denoise_spatial_implementation.sh diff --git a/examples/xx-denoise/fs_denoise_temporal.sc b/examples/43-denoise/fs_denoise_temporal.sc similarity index 100% rename from examples/xx-denoise/fs_denoise_temporal.sc rename to examples/43-denoise/fs_denoise_temporal.sc diff --git a/examples/xx-denoise/fs_denoise_txaa.sc b/examples/43-denoise/fs_denoise_txaa.sc similarity index 100% rename from examples/xx-denoise/fs_denoise_txaa.sc rename to examples/43-denoise/fs_denoise_txaa.sc diff --git a/examples/xx-denoise/makefile b/examples/43-denoise/makefile similarity index 100% rename from examples/xx-denoise/makefile rename to examples/43-denoise/makefile diff --git a/examples/xx-denoise/normal_encoding.sh b/examples/43-denoise/normal_encoding.sh similarity index 100% rename from examples/xx-denoise/normal_encoding.sh rename to examples/43-denoise/normal_encoding.sh diff --git a/examples/xx-denoise/parameters.sh b/examples/43-denoise/parameters.sh similarity index 100% rename from examples/xx-denoise/parameters.sh rename to examples/43-denoise/parameters.sh diff --git a/examples/xx-denoise/shared_functions.sh b/examples/43-denoise/shared_functions.sh similarity index 100% rename from examples/xx-denoise/shared_functions.sh rename to examples/43-denoise/shared_functions.sh diff --git a/examples/xx-denoise/varying.def.sc b/examples/43-denoise/varying.def.sc similarity index 100% rename from examples/xx-denoise/varying.def.sc rename to examples/43-denoise/varying.def.sc diff --git a/examples/xx-denoise/vs_denoise_gbuffer.sc b/examples/43-denoise/vs_denoise_gbuffer.sc similarity index 100% rename from examples/xx-denoise/vs_denoise_gbuffer.sc rename to examples/43-denoise/vs_denoise_gbuffer.sc diff --git a/examples/xx-denoise/vs_denoise_screenquad.sc b/examples/43-denoise/vs_denoise_screenquad.sc similarity index 100% rename from examples/xx-denoise/vs_denoise_screenquad.sc rename to examples/43-denoise/vs_denoise_screenquad.sc diff --git a/examples/runtime/shaders/dx11/fs_denoise_apply_lighting.bin b/examples/runtime/shaders/dx11/fs_denoise_apply_lighting.bin new file mode 100644 index 000000000..9b13db3bd Binary files /dev/null and b/examples/runtime/shaders/dx11/fs_denoise_apply_lighting.bin differ diff --git a/examples/runtime/shaders/dx11/fs_denoise_copy.bin b/examples/runtime/shaders/dx11/fs_denoise_copy.bin new file mode 100644 index 000000000..40c1b9428 Binary files /dev/null and b/examples/runtime/shaders/dx11/fs_denoise_copy.bin differ diff --git a/examples/runtime/shaders/dx11/fs_denoise_deferred_combine.bin b/examples/runtime/shaders/dx11/fs_denoise_deferred_combine.bin new file mode 100644 index 000000000..1b2c49237 Binary files /dev/null and b/examples/runtime/shaders/dx11/fs_denoise_deferred_combine.bin differ diff --git a/examples/runtime/shaders/dx11/fs_denoise_gbuffer.bin b/examples/runtime/shaders/dx11/fs_denoise_gbuffer.bin new file mode 100644 index 000000000..de874793d Binary files /dev/null and b/examples/runtime/shaders/dx11/fs_denoise_gbuffer.bin differ diff --git a/examples/runtime/shaders/dx11/fs_denoise_spatial_3x3.bin b/examples/runtime/shaders/dx11/fs_denoise_spatial_3x3.bin new file mode 100644 index 000000000..99927b475 Binary files /dev/null and b/examples/runtime/shaders/dx11/fs_denoise_spatial_3x3.bin differ diff --git a/examples/runtime/shaders/dx11/fs_denoise_spatial_5x5.bin b/examples/runtime/shaders/dx11/fs_denoise_spatial_5x5.bin new file mode 100644 index 000000000..7c27045a7 Binary files /dev/null and b/examples/runtime/shaders/dx11/fs_denoise_spatial_5x5.bin differ diff --git a/examples/runtime/shaders/dx11/fs_denoise_temporal.bin b/examples/runtime/shaders/dx11/fs_denoise_temporal.bin new file mode 100644 index 000000000..528198e68 Binary files /dev/null and b/examples/runtime/shaders/dx11/fs_denoise_temporal.bin differ diff --git a/examples/runtime/shaders/dx11/fs_denoise_txaa.bin b/examples/runtime/shaders/dx11/fs_denoise_txaa.bin new file mode 100644 index 000000000..3ca080abd Binary files /dev/null and b/examples/runtime/shaders/dx11/fs_denoise_txaa.bin differ diff --git a/examples/runtime/shaders/dx11/vs_denoise_gbuffer.bin b/examples/runtime/shaders/dx11/vs_denoise_gbuffer.bin new file mode 100644 index 000000000..8ebcbd19a Binary files /dev/null and b/examples/runtime/shaders/dx11/vs_denoise_gbuffer.bin differ diff --git a/examples/runtime/shaders/dx11/vs_denoise_screenquad.bin b/examples/runtime/shaders/dx11/vs_denoise_screenquad.bin new file mode 100644 index 000000000..6c9e1ce72 Binary files /dev/null and b/examples/runtime/shaders/dx11/vs_denoise_screenquad.bin differ diff --git a/examples/runtime/shaders/glsl/fs_denoise_apply_lighting.bin b/examples/runtime/shaders/glsl/fs_denoise_apply_lighting.bin new file mode 100644 index 000000000..54ba76c54 Binary files /dev/null and b/examples/runtime/shaders/glsl/fs_denoise_apply_lighting.bin differ diff --git a/examples/runtime/shaders/glsl/fs_denoise_copy.bin b/examples/runtime/shaders/glsl/fs_denoise_copy.bin new file mode 100644 index 000000000..664d50ec0 Binary files /dev/null and b/examples/runtime/shaders/glsl/fs_denoise_copy.bin differ diff --git a/examples/runtime/shaders/glsl/fs_denoise_deferred_combine.bin b/examples/runtime/shaders/glsl/fs_denoise_deferred_combine.bin new file mode 100644 index 000000000..2970c69f2 Binary files /dev/null and b/examples/runtime/shaders/glsl/fs_denoise_deferred_combine.bin differ diff --git a/examples/runtime/shaders/glsl/fs_denoise_gbuffer.bin b/examples/runtime/shaders/glsl/fs_denoise_gbuffer.bin new file mode 100644 index 000000000..f3ae09da9 Binary files /dev/null and b/examples/runtime/shaders/glsl/fs_denoise_gbuffer.bin differ diff --git a/examples/runtime/shaders/glsl/fs_denoise_spatial_3x3.bin b/examples/runtime/shaders/glsl/fs_denoise_spatial_3x3.bin new file mode 100644 index 000000000..4a39f363f Binary files /dev/null and b/examples/runtime/shaders/glsl/fs_denoise_spatial_3x3.bin differ diff --git a/examples/runtime/shaders/glsl/fs_denoise_spatial_5x5.bin b/examples/runtime/shaders/glsl/fs_denoise_spatial_5x5.bin new file mode 100644 index 000000000..47677441f Binary files /dev/null and b/examples/runtime/shaders/glsl/fs_denoise_spatial_5x5.bin differ diff --git a/examples/runtime/shaders/glsl/fs_denoise_temporal.bin b/examples/runtime/shaders/glsl/fs_denoise_temporal.bin new file mode 100644 index 000000000..0ea5bf970 Binary files /dev/null and b/examples/runtime/shaders/glsl/fs_denoise_temporal.bin differ diff --git a/examples/runtime/shaders/glsl/fs_denoise_txaa.bin b/examples/runtime/shaders/glsl/fs_denoise_txaa.bin new file mode 100644 index 000000000..5be4fec28 Binary files /dev/null and b/examples/runtime/shaders/glsl/fs_denoise_txaa.bin differ diff --git a/examples/runtime/shaders/glsl/vs_denoise_gbuffer.bin b/examples/runtime/shaders/glsl/vs_denoise_gbuffer.bin new file mode 100644 index 000000000..4b88fa296 Binary files /dev/null and b/examples/runtime/shaders/glsl/vs_denoise_gbuffer.bin differ diff --git a/examples/runtime/shaders/glsl/vs_denoise_screenquad.bin b/examples/runtime/shaders/glsl/vs_denoise_screenquad.bin new file mode 100644 index 000000000..8d77bb679 Binary files /dev/null and b/examples/runtime/shaders/glsl/vs_denoise_screenquad.bin differ diff --git a/examples/runtime/shaders/metal/fs_denoise_apply_lighting.bin b/examples/runtime/shaders/metal/fs_denoise_apply_lighting.bin new file mode 100644 index 000000000..d007881c5 Binary files /dev/null and b/examples/runtime/shaders/metal/fs_denoise_apply_lighting.bin differ diff --git a/examples/runtime/shaders/metal/fs_denoise_copy.bin b/examples/runtime/shaders/metal/fs_denoise_copy.bin new file mode 100644 index 000000000..45a5c98ec Binary files /dev/null and b/examples/runtime/shaders/metal/fs_denoise_copy.bin differ diff --git a/examples/runtime/shaders/metal/fs_denoise_deferred_combine.bin b/examples/runtime/shaders/metal/fs_denoise_deferred_combine.bin new file mode 100644 index 000000000..ec9a74449 Binary files /dev/null and b/examples/runtime/shaders/metal/fs_denoise_deferred_combine.bin differ diff --git a/examples/runtime/shaders/metal/fs_denoise_gbuffer.bin b/examples/runtime/shaders/metal/fs_denoise_gbuffer.bin new file mode 100644 index 000000000..bc7d7c2d7 Binary files /dev/null and b/examples/runtime/shaders/metal/fs_denoise_gbuffer.bin differ diff --git a/examples/runtime/shaders/metal/fs_denoise_spatial_3x3.bin b/examples/runtime/shaders/metal/fs_denoise_spatial_3x3.bin new file mode 100644 index 000000000..ff03bc48f Binary files /dev/null and b/examples/runtime/shaders/metal/fs_denoise_spatial_3x3.bin differ diff --git a/examples/runtime/shaders/metal/fs_denoise_spatial_5x5.bin b/examples/runtime/shaders/metal/fs_denoise_spatial_5x5.bin new file mode 100644 index 000000000..a97049585 Binary files /dev/null and b/examples/runtime/shaders/metal/fs_denoise_spatial_5x5.bin differ diff --git a/examples/runtime/shaders/metal/fs_denoise_temporal.bin b/examples/runtime/shaders/metal/fs_denoise_temporal.bin new file mode 100644 index 000000000..1cd17e653 Binary files /dev/null and b/examples/runtime/shaders/metal/fs_denoise_temporal.bin differ diff --git a/examples/runtime/shaders/metal/fs_denoise_txaa.bin b/examples/runtime/shaders/metal/fs_denoise_txaa.bin new file mode 100644 index 000000000..2d39dc3e3 Binary files /dev/null and b/examples/runtime/shaders/metal/fs_denoise_txaa.bin differ diff --git a/examples/runtime/shaders/metal/vs_denoise_gbuffer.bin b/examples/runtime/shaders/metal/vs_denoise_gbuffer.bin new file mode 100644 index 000000000..b91499507 Binary files /dev/null and b/examples/runtime/shaders/metal/vs_denoise_gbuffer.bin differ diff --git a/examples/runtime/shaders/metal/vs_denoise_screenquad.bin b/examples/runtime/shaders/metal/vs_denoise_screenquad.bin new file mode 100644 index 000000000..c739d7e59 Binary files /dev/null and b/examples/runtime/shaders/metal/vs_denoise_screenquad.bin differ diff --git a/examples/runtime/shaders/spirv/fs_denoise_apply_lighting.bin b/examples/runtime/shaders/spirv/fs_denoise_apply_lighting.bin new file mode 100644 index 000000000..aef3cfcde Binary files /dev/null and b/examples/runtime/shaders/spirv/fs_denoise_apply_lighting.bin differ diff --git a/examples/runtime/shaders/spirv/fs_denoise_copy.bin b/examples/runtime/shaders/spirv/fs_denoise_copy.bin new file mode 100644 index 000000000..8e0fb66dc Binary files /dev/null and b/examples/runtime/shaders/spirv/fs_denoise_copy.bin differ diff --git a/examples/runtime/shaders/spirv/fs_denoise_deferred_combine.bin b/examples/runtime/shaders/spirv/fs_denoise_deferred_combine.bin new file mode 100644 index 000000000..fa6ea8b9b Binary files /dev/null and b/examples/runtime/shaders/spirv/fs_denoise_deferred_combine.bin differ diff --git a/examples/runtime/shaders/spirv/fs_denoise_gbuffer.bin b/examples/runtime/shaders/spirv/fs_denoise_gbuffer.bin new file mode 100644 index 000000000..d8ff3db99 Binary files /dev/null and b/examples/runtime/shaders/spirv/fs_denoise_gbuffer.bin differ diff --git a/examples/runtime/shaders/spirv/fs_denoise_spatial_3x3.bin b/examples/runtime/shaders/spirv/fs_denoise_spatial_3x3.bin new file mode 100644 index 000000000..6ab12ddec Binary files /dev/null and b/examples/runtime/shaders/spirv/fs_denoise_spatial_3x3.bin differ diff --git a/examples/runtime/shaders/spirv/fs_denoise_spatial_5x5.bin b/examples/runtime/shaders/spirv/fs_denoise_spatial_5x5.bin new file mode 100644 index 000000000..ae95970d7 Binary files /dev/null and b/examples/runtime/shaders/spirv/fs_denoise_spatial_5x5.bin differ diff --git a/examples/runtime/shaders/spirv/fs_denoise_temporal.bin b/examples/runtime/shaders/spirv/fs_denoise_temporal.bin new file mode 100644 index 000000000..ebc781c34 Binary files /dev/null and b/examples/runtime/shaders/spirv/fs_denoise_temporal.bin differ diff --git a/examples/runtime/shaders/spirv/fs_denoise_txaa.bin b/examples/runtime/shaders/spirv/fs_denoise_txaa.bin new file mode 100644 index 000000000..370bc762a Binary files /dev/null and b/examples/runtime/shaders/spirv/fs_denoise_txaa.bin differ diff --git a/examples/runtime/shaders/spirv/vs_denoise_gbuffer.bin b/examples/runtime/shaders/spirv/vs_denoise_gbuffer.bin new file mode 100644 index 000000000..436c6db43 Binary files /dev/null and b/examples/runtime/shaders/spirv/vs_denoise_gbuffer.bin differ diff --git a/examples/runtime/shaders/spirv/vs_denoise_screenquad.bin b/examples/runtime/shaders/spirv/vs_denoise_screenquad.bin new file mode 100644 index 000000000..da03129e9 Binary files /dev/null and b/examples/runtime/shaders/spirv/vs_denoise_screenquad.bin differ diff --git a/scripts/genie.lua b/scripts/genie.lua index 183a27435..b8f60cc6e 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -581,6 +581,7 @@ or _OPTIONS["with-combined-examples"] then , "40-svt" , "41-tess" , "42-bunnylod" + , "43-denoise" ) -- 17-drawstress requires multithreading, does not compile for singlethreaded wasm