From dc12fa2c2afbb82cbeda74a5ab60f53d948a3ecf Mon Sep 17 00:00:00 2001 From: luboslenco Date: Thu, 12 Nov 2020 16:15:16 +0100 Subject: [PATCH] Make snapshot work for raytrace builds --- Sources/Main.hx | 23 +++++++++++++++++++++++ khafile.js | 6 +++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Sources/Main.hx b/Sources/Main.hx index 1c26ea76..a3199b3a 100644 --- a/Sources/Main.hx +++ b/Sources/Main.hx @@ -90,6 +90,29 @@ class Main { untyped global['data/' + file] = null; } + #if (kha_direct3d12 || kha_vulkan) + + var ext = #if kha_direct3d12 ".cso" #else ".spirv" #end ; + + var files_renderlib = [ + "bnoise_rank.k", + "bnoise_scramble.k", + "bnoise_sobol.k", + "raytrace_bake_ao" + ext, + "raytrace_bake_bent" + ext, + "raytrace_bake_light" + ext, + "raytrace_bake_thick" + ext, + "raytrace_brute_core" + ext, + "raytrace_brute_full" + ext + ]; + + for (file in files_renderlib) { + embedBlob(file, untyped global['data/' + file]); + untyped global['data/' + file] = null; + } + + #end + #end // arm_snapshot #if (!arm_snapshot) diff --git a/khafile.js b/khafile.js index 576b7d2d..e6cc9590 100644 --- a/khafile.js +++ b/khafile.js @@ -99,13 +99,13 @@ project.addAssets("Assets/readme/readme.txt", { destination: "{name}" }); if (raytrace) { project.addLibrary("renderlib"); - project.addAssets("Libraries/renderlib/Assets/*", { destination: "data/{name}" }); + project.addAssets("Libraries/renderlib/Assets/*", { destination: "data/{name}", embed: snapshot }); if (d3d12) { - project.addAssets("Libraries/renderlib/Shaders/*.cso", { destination: "data/{name}" }); + project.addAssets("Libraries/renderlib/Shaders/*.cso", { destination: "data/{name}", embed: snapshot }); project.addAssets("Assets/readme/readme_dxr.txt", { destination: "{name}" }); } else if (vulkan) { - project.addAssets("Libraries/renderlib/Shaders/*.spirv", { destination: "data/{name}" }); + project.addAssets("Libraries/renderlib/Shaders/*.spirv", { destination: "data/{name}", embed: snapshot }); project.addAssets("Assets/readme/readme_vkrt.txt", { destination: "{name}" }); } }