From bd35b76b8da4f3ca069bbcb2a0304d83be53be4d Mon Sep 17 00:00:00 2001 From: Bill Hollings Date: Sat, 11 Apr 2020 21:45:47 -0400 Subject: [PATCH] API-Samples demos add input_attachment and push_descriptors demos. --- Demos/LunarG-VulkanSamples/API-Samples/Samples.h | 13 +++++++++---- Docs/Whats_New.md | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Demos/LunarG-VulkanSamples/API-Samples/Samples.h b/Demos/LunarG-VulkanSamples/API-Samples/Samples.h index 3587dd05..06ca7dd4 100644 --- a/Demos/LunarG-VulkanSamples/API-Samples/Samples.h +++ b/Demos/LunarG-VulkanSamples/API-Samples/Samples.h @@ -64,6 +64,10 @@ # include "../VulkanSamples/API-Samples/immutable_sampler/immutable_sampler.cpp" #endif +#ifdef MVK_SAMP_input_attachment +# include "../VulkanSamples/API-Samples/input_attachment/input_attachment.cpp" +#endif + #ifdef MVK_SAMP_memory_barriers # include "../VulkanSamples/API-Samples/memory_barriers/memory_barriers.cpp" #endif @@ -88,6 +92,10 @@ # include "../VulkanSamples/API-Samples/push_constants/push_constants.cpp" #endif +#ifdef MVK_SAMP_push_descriptors +# include "../VulkanSamples/API-Samples/push_descriptors/push_descriptors.cpp" +#endif + #ifdef MVK_SAMP_secondary_command_buffer # include "../VulkanSamples/API-Samples/secondary_command_buffer/secondary_command_buffer.cpp" #endif @@ -96,10 +104,7 @@ # include "../VulkanSamples/API-Samples/separate_image_sampler/separate_image_sampler.cpp" #endif -#ifdef MVK_SAMP_template -# include "../VulkanSamples/API-Samples/template/template.cpp" -#endif - +// Does not run on macOS, which does not support textures in host-coherent memory. #ifdef MVK_SAMP_texel_buffer # include "../VulkanSamples/API-Samples/texel_buffer/texel_buffer.cpp" #endif diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md index 98f16b3a..7d6e9a88 100644 --- a/Docs/Whats_New.md +++ b/Docs/Whats_New.md @@ -19,6 +19,8 @@ MoltenVK 1.0.42 Released TBD +- Reinstate `VulkanSamples API-Samples` demo apps and add + `input_attachment` and `push_descriptors` demos. - Consolidate frame and non-frame performance reporting. - Remove `vkGetSwapchainPerformanceMVK()` from API. - Swapchain performance can be retrieved with other activity performance