Upgrade the sample for version 2 of VK_AMDX_shader_enqueue

Changes:
- Added mesh node samples
- Removed SPIR-V intrinsics-based shaders
- Updated HLSL shaders to use the node syntax
  (HLSL needs offline compilation to SPIR-V)

Author: yavn

CMakeLists.txt

@@ -1,4 +1,5 @@
 # Copyright (c) 2020-2023, Arm Limited and Contributors
+# Copyright (c) 2024 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -46,6 +47,10 @@ add_compile_definitions($<$<CONFIG:DEBUG>:VKB_DEBUG>)
 
 project(vulkan_samples)
 
+if(MSVC)
+    add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
+endif()
+
 # create output folder
 file(MAKE_DIRECTORY output)
 

LICENSE

@@ -2,7 +2,7 @@ AMD sample code license:
 
 MIT License
 
-Copyright (c) 2023 Advanced Micro Devices, Inc.
+Copyright (c) 2023-2024 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -24,12 +24,19 @@ access to GPU Work Graphs feature on Radeon™ RX 7000 series graphics cards
 
 To build the sample, follow the standard build instructions.
 
-To run the sample, execute with the arguments `sample gpu_dispatch`.
+To run the compute sample, execute with the arguments `sample gpu_dispatch`.
 See more details and command line options in the [readme](./samples/extensions/gpu_dispatch/README.md).
 
+To run the mesh draw sample, execute with the arguments `sample gpu_draw_dispatch`.
+See more details and command line options in the [readme](./samples/extensions/gpu_draw_dispatch/README.md).
+
 Navigate to the following paths to learn more:
-- [source code](./samples/extensions/gpu_dispatch)
-- [shaders](./shaders/gpu_dispatch)
+- Source code
+  - [samples/extensions/gpu_dispatch](./samples/extensions/gpu_dispatch)
+  - [samples/extensions/gpu_draw_dispatch](./samples/extensions/gpu_draw_dispatch)
+- Shaders
+  - [shaders/gpu_dispatch](./shaders/gpu_dispatch)
+  - [shaders/gpu_draw_dispatch](./shaders/gpu_draw_dispatch)
 
 # Vulkan Samples <!-- omit in toc -->
 

app/plugins/benchmark_mode/benchmark_mode.cpp

@@ -1,4 +1,5 @@
 /* Copyright (c) 2020-2021, Arm Limited and Contributors
+ * Copyright (c) 2024 Advanced Micro Devices, Inc. All Rights Reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -39,12 +40,16 @@ void BenchmarkMode::init(const vkb::CommandParser &parser)
 	// Whilst in benchmark mode fix the fps so that separate runs are consistently simulated
 	// This will effect the graph outputs of framerate
 	platform->force_simulation_fps(60.0f);
+	enabled = true;
 }
 
 void BenchmarkMode::on_update(float delta_time)
 {
-	elapsed_time += delta_time;
-	total_frames++;
+	if (enabled)
+	{
+		elapsed_time += delta_time;
+		total_frames++;
+	}
 }
 
 void BenchmarkMode::on_app_start(const std::string &app_id)
@@ -58,4 +63,10 @@ void BenchmarkMode::on_app_close(const std::string &app_id)
 {
 	LOGI("Benchmark for {} completed in {} seconds (ran {} frames, averaged {} fps)", app_id, elapsed_time, total_frames, total_frames / elapsed_time);
 }
-}        // namespace plugins
+
+void BenchmarkMode::set_enabled(bool is_enabled)
+{
+	enabled = is_enabled;
+}
+
+}        // namespace plugins

app/plugins/benchmark_mode/benchmark_mode.h

@@ -1,4 +1,5 @@
 /* Copyright (c) 2020-2021, Arm Limited and Contributors
+ * Copyright (c) 2024 Advanced Micro Devices, Inc. All Rights Reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -27,11 +28,11 @@ using BenchmarkModeTags = vkb::PluginBase<BenchmarkMode, vkb::tags::Passive>;
 
 /**
  * @brief Benchmark Mode
- * 
+ *
  * When enabled frame time statistics of a samples run will be printed to the console when an application closes. The simulation frame time (delta time) is also locked to 60FPS so that statistics can be compared more accurately across different devices.
- * 
+ *
  * Usage: vulkan_samples sample afbc --benchmark
- * 
+ *
  */
 class BenchmarkMode : public BenchmarkModeTags
 {
@@ -50,9 +51,13 @@ class BenchmarkMode : public BenchmarkModeTags
 
 	virtual void on_app_close(const std::string &app_info) override;
 
+	void set_enabled(bool is_enabled);
+
 	vkb::FlagCommand benchmark_flag = {vkb::FlagType::FlagOnly, "benchmark", "", "Enable benchmark mode"};
 
   private:
+	bool enabled{false};
+
 	uint32_t total_frames{0};
 
 	float elapsed_time{0.0f};

app/plugins/generic_options/generic_options.cpp

@@ -1,4 +1,4 @@
-//  Copyright (c) 2023 Advanced Micro Devices, Inc. All Rights Reserved.
+//  Copyright (c) 2023-2024 Advanced Micro Devices, Inc. All Rights Reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

app/plugins/generic_options/generic_options.h

@@ -1,4 +1,4 @@
-//  Copyright (c) 2023 Advanced Micro Devices, Inc. All Rights Reserved.
+//  Copyright (c) 2023-2024 Advanced Micro Devices, Inc. All Rights Reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

app/plugins/stop_after/stop_after.cpp

@@ -1,4 +1,5 @@
 /* Copyright (c) 2020-2021, Arm Limited and Contributors
+ * Copyright (c) 2024 Advanced Micro Devices, Inc. All Rights Reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -22,27 +23,45 @@ namespace plugins
 StopAfter::StopAfter() :
     StopAfterTags("Stop After X",
                   "A collection of flags to stop the running application after a set period.",
-                  {vkb::Hook::OnUpdate}, {&stop_after_frame_flag})
+                  {vkb::Hook::OnUpdate},
+                  {&stop_after_frame_flag, &stop_after_seconds_flag})
 {
 }
 
 bool StopAfter::is_active(const vkb::CommandParser &parser)
 {
-	return parser.contains(&stop_after_frame_flag);
+	return parser.contains(&stop_after_frame_flag) || parser.contains(&stop_after_seconds_flag);
 }
 
 void StopAfter::init(const vkb::CommandParser &parser)
 {
+	enabled = true;
+
 	remaining_frames = parser.as<uint32_t>(&stop_after_frame_flag);
+	use_frames = (remaining_frames > 0);
+
+	remaining_time = parser.as<float>(&stop_after_seconds_flag);
+	use_time = (remaining_time > 0.0f);
 }
 
 void StopAfter::on_update(float delta_time)
 {
-	remaining_frames--;
-
-	if (remaining_frames <= 0)
+	if (enabled)
 	{
-		platform->close();
+		remaining_frames--;
+		remaining_time -= delta_time;
+
+		if ((use_frames && (remaining_frames <= 0)) ||
+			(use_time && (remaining_time <= 0.0f)))
+		{
+			platform->close();
+		}
 	}
 }
-}        // namespace plugins
+
+void StopAfter::set_enabled(bool is_enabled)
+{
+	enabled = is_enabled;
+}
+
+}        // namespace plugins

app/plugins/stop_after/stop_after.h

@@ -1,4 +1,5 @@
 /* Copyright (c) 2020-2021, Arm Limited and Contributors
+ * Copyright (c) 2024 Advanced Micro Devices, Inc. All Rights Reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -21,17 +22,17 @@
 
 namespace plugins
 {
-using StopAfterTags = vkb::PluginBase<vkb::tags::Stopping>;
+class StopAfter;
+
+using StopAfterTags = vkb::PluginBase<StopAfter, vkb::tags::Stopping>;
 
 /**
  * @brief Stop After
- * 
+ *
  * Stop the execution of the app after a specific frame.
- * 
+ *
  * Usage: vulkan_sample sample afbc --stop-after-frame 100
- * 
- * TODO: Add stop after duration
- * 
+ *
  */
 class StopAfter : public StopAfterTags
 {
@@ -46,9 +47,18 @@ class StopAfter : public StopAfterTags
 
 	virtual void on_update(float delta_time) override;
 
+	void set_enabled(bool is_enabled);
+
 	vkb::FlagCommand stop_after_frame_flag = {vkb::FlagType::OneValue, "stop-after-frame", "", "Stop the application after a certain number of frames"};
+	vkb::FlagCommand stop_after_seconds_flag = {vkb::FlagType::OneValue, "stop-after-seconds", "", "Stop the application after elapsed time in seconds"};
 
   private:
+	bool enabled{false};
+
+	bool use_frames{false};
 	uint32_t remaining_frames{0};
+
+	bool use_time{false};
+	float remaining_time{0.0f};
 };
 }        // namespace plugins

framework/api_vulkan_sample.cpp

@@ -1,4 +1,5 @@
 /* Copyright (c) 2019-2023, Sascha Willems
+ * Copyright (c) 2024 Advanced Micro Devices, Inc. All Rights Reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -1270,11 +1271,11 @@ Texture ApiVulkanSample::load_texture_cubemap(const std::string &file, vkb::sg::
 	return texture;
 }
 
-std::unique_ptr<vkb::sg::SubMesh> ApiVulkanSample::load_model(const std::string &file, uint32_t index)
+std::unique_ptr<vkb::sg::SubMesh> ApiVulkanSample::load_model(const std::string &file, uint32_t index, bool mesh_shader_buffer)
 {
-	vkb::GLTFLoader loader{*device};
+	vkb::GLTFLoader loader{get_device()};
 
-	std::unique_ptr<vkb::sg::SubMesh> model = loader.read_model_from_file(file, index);
+	std::unique_ptr<vkb::sg::SubMesh> model = loader.read_model_from_file(file, index, mesh_shader_buffer);
 
 	if (!model)
 	{