Merge branch 'KhronosGroup:main' into arovir01/simple_tensor_and_data_graph

arovir01 · web-flow · commit 06ce09fca3e1 · 2025-08-14T14:26:38.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -103,7 +103,7 @@ jobs:
           key: ${{ github.job }}-${{ matrix.os }}
       - name: Configure and build
         run: |
-          cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON
+          cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON -DCMAKE_OSX_SYSROOT=macosx -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0
           cmake --build "build/${{ matrix.platform }}" --target vulkan_samples --config ${{ matrix.build_type }} ${{ env.PARALLEL }}
 
   build_d2d:
@@ -194,5 +194,5 @@ jobs:
       - name: build_ios
         run: |
           source ~/VulkanSDK/iOS/setup-env.sh
-          cmake -H"." -B"build/ios" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON -G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO
-          cmake --build "build/ios" --target vulkan_samples --config ${{ matrix.build_type }} -- -sdk iphoneos -allowProvisioningUpdates
+          cmake -H"." -B"build/ios" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON -G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO
+          cmake --build "build/ios" --target vulkan_samples --config ${{ matrix.build_type }} -- -allowProvisioningUpdates
diff --git a/docs/build.adoc b/docs/build.adoc
@@ -229,6 +229,26 @@ build\windows\app\bin\Release\AMD64\vulkan_samples.exe sample <sample_name>
 sudo apt-get install cmake g++ xorg-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev
 ----
 
+=== Selecting the window system
+
+On Linux, the samples support different window systems. If not explicitly set, default is X11 Xcb. If you want to build with another window system, use the `VKB_WSI_SELECTION` CMake option like this:
+
+----
+cmake -G "Unix Makefiles" -Bbuild/linux -DCMAKE_BUILD_TYPE=Release -DVKB_WSI_SELECTION=WAYLAND
+----
+
+Available Linux window systems:
+
+[cols="1,1"]
+|===
+| VKB_WSI_SELECTION | Window system
+
+| XCB | X11 Xcb (Default)
+| XLIB | X11 Xlib
+| WAYLAND | Wayland
+| D2D | Direct to Display (`VK_KHR_DISPLAY`)
+|===
+
 === Build with CMake
 
 `Step 1.` The following command will generate the project
@@ -271,15 +291,15 @@ source /PATH/TO/VULKAN/SDK/setup-env.sh
 `Step 1.` The following command will generate the project
 
 ----
-cmake -G Xcode -Bbuild/mac-xcode -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_SYSROOT=macosx
+cmake -G Xcode -Bbuild/mac-xcode -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_SYSROOT=macosx -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0
 ----
 
 Open the *vulkan_samples* Xcode project inside build/mac-xcode and build with command-B.  To run Vulkan Samples, use Xcode's edit-scheme selection and set the arguments to --help. Click the "Play" button and you should see the help output in the terminal. For convenience, the default setting is to run the hello_triangle sample; just edit that to your desired sample to run.
 
 Alternatively, for command line builds use the steps below:
 
 ----
-cmake -Bbuild/mac -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_SYSROOT=macosx
+cmake -Bbuild/mac -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_SYSROOT=macosx -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0
 ----
 
 `Step 2.` Build the project
@@ -335,7 +355,7 @@ It's recommended to open the *vulkan_samples* Xcode project that is generated in
 Alternatively, you can build with cmake as shown here
 
 ----
-cmake --build build/ios --config Release --target vulkan_samples -j$(sysctl -n hw.ncpu) -- -sdk iphoneos -allowProvisioningUpdates
+cmake --build build/ios --config Release --target vulkan_samples -j$(sysctl -n hw.ncpu) -- -allowProvisioningUpdates
 ----
 
 `Step 3.` Run the *Vulkan Samples* application
diff --git a/framework/core/hpp_instance.cpp b/framework/core/hpp_instance.cpp
@@ -148,6 +148,11 @@ bool enable_layer_setting(const vk::LayerSettingEXT        &requested_layer_sett
 	bool is_available =
 	    std::ranges::any_of(enabled_layers,
 	                        [&requested_layer_setting](auto const &available_layer) { return strcmp(available_layer, requested_layer_setting.pLayerName) == 0; });
+#if defined(PLATFORM__MACOS)
+	// On Apple platforms the MoltenVK layer is implicitly enabled and available, and cannot be explicitly added or checked via enabled_layers.
+	is_available = is_available || strcmp(requested_layer_setting.pLayerName, "MoltenVK") == 0;
+#endif
+
 	if (!is_available)
 	{
 		LOGW("Layer: {} not found. Disabling layer setting: {}", requested_layer_setting.pLayerName, requested_layer_setting.pSettingName);
diff --git a/framework/core/instance.cpp b/framework/core/instance.cpp
@@ -142,6 +142,11 @@ bool enable_layer_setting(const VkLayerSettingEXT         &requested_layer_setti
 	bool is_available =
 	    std::ranges::any_of(enabled_layers,
 	                        [&requested_layer_setting](auto const &available_layer) { return strcmp(available_layer, requested_layer_setting.pLayerName) == 0; });
+#if defined(PLATFORM__MACOS)
+	// On Apple platforms the MoltenVK layer is implicitly enabled and available, and cannot be explicitly added or checked via enabled_layers.
+	is_available = is_available || strcmp(requested_layer_setting.pLayerName, "MoltenVK") == 0;
+#endif
+
 	if (!is_available)
 	{
 		LOGW("Layer: {} not found. Disabling layer setting: {}", requested_layer_setting.pLayerName, requested_layer_setting.pSettingName);
diff --git a/framework/gui.h b/framework/gui.h
@@ -36,6 +36,10 @@
 #include <imgui_internal.h>
 #include <numeric>
 
+#if defined(PLATFORM__MACOS)
+#	include <TargetConditionals.h>
+#endif
+
 namespace vkb
 {
 
@@ -548,7 +552,9 @@ inline void
 	push_transform       = glm::scale(push_transform, glm::vec3(2.0f / io.DisplaySize.x, 2.0f / io.DisplaySize.y, 0.0f));
 	command_buffer.pushConstants(pipeline_layout, vk::ShaderStageFlagBits::eVertex, 0, sizeof(glm::mat4), &push_transform);
 
-	command_buffer.bindVertexBuffers(0, vertex_buffer->get_handle(), {0});
+	vk::DeviceSize vertex_offsets[1]    = {0};
+	vk::Buffer     vertex_buffer_handle = vertex_buffer->get_handle();
+	command_buffer.bindVertexBuffers(0, vertex_buffer_handle, vertex_offsets);
 
 	command_buffer.bindIndexBuffer(index_buffer->get_handle(), 0, vk::IndexType::eUint16);
 
diff --git a/samples/extensions/descriptor_indexing/descriptor_indexing.cpp b/samples/extensions/descriptor_indexing/descriptor_indexing.cpp
@@ -32,8 +32,8 @@ DescriptorIndexing::DescriptorIndexing()
 	// See: https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/2350.
 	add_device_extension(VK_KHR_MAINTENANCE1_EXTENSION_NAME);
 
-#if defined(PLATFORM__MACOS) && TARGET_OS_OSX
-	// On macOS use layer setting to configure MoltenVK for using Metal argument buffers (needed for descriptor indexing)
+#if defined(PLATFORM__MACOS)
+	// On Apple use layer setting to enable MoltenVK's Metal argument buffers - needed for descriptor indexing/scaling
 	add_instance_extension(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME, /*optional*/ true);
 
 	VkLayerSettingEXT layerSetting;
@@ -47,10 +47,6 @@ DescriptorIndexing::DescriptorIndexing()
 	layerSetting.pValues                         = &useMetalArgumentBuffers;
 
 	add_layer_setting(layerSetting);
-
-	// On macOS also set environment variable as fallback in case layer settings not available at runtime with older SDKs
-	// Will not work in batch mode, but is the best we can do short of using the deprecated MoltenVK private config API
-	setenv("MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS", "1", 1);
 #endif
 }
 
diff --git a/samples/performance/layout_transitions/layout_transitions.cpp b/samples/performance/layout_transitions/layout_transitions.cpp
@@ -36,6 +36,23 @@ LayoutTransitions::LayoutTransitions()
 
 	config.insert<vkb::IntSetting>(0, reinterpret_cast<int &>(layout_transition_type), LayoutTransitionType::UNDEFINED);
 	config.insert<vkb::IntSetting>(1, reinterpret_cast<int &>(layout_transition_type), LayoutTransitionType::LAST_LAYOUT);
+
+#if defined(PLATFORM__MACOS) && TARGET_OS_IOS && TARGET_OS_SIMULATOR
+	// On iOS Simulator use layer setting to disable MoltenVK's Metal argument buffers - otherwise blank display
+	add_instance_extension(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME, /*optional*/ true);
+
+	VkLayerSettingEXT layerSetting;
+	layerSetting.pLayerName   = "MoltenVK";
+	layerSetting.pSettingName = "MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS";
+	layerSetting.type         = VK_LAYER_SETTING_TYPE_INT32_EXT;
+	layerSetting.valueCount   = 1;
+
+	// Make this static so layer setting reference remains valid after leaving constructor scope
+	static const int32_t useMetalArgumentBuffers = 0;
+	layerSetting.pValues                         = &useMetalArgumentBuffers;
+
+	add_layer_setting(layerSetting);
+#endif
 }
 
 bool LayoutTransitions::prepare(const vkb::ApplicationOptions &options)
diff --git a/samples/performance/pipeline_barriers/pipeline_barriers.cpp b/samples/performance/pipeline_barriers/pipeline_barriers.cpp
@@ -38,6 +38,23 @@ PipelineBarriers::PipelineBarriers()
 	config.insert<vkb::IntSetting>(0, reinterpret_cast<int &>(dependency_type), DependencyType::BOTTOM_TO_TOP);
 	config.insert<vkb::IntSetting>(1, reinterpret_cast<int &>(dependency_type), DependencyType::FRAG_TO_VERT);
 	config.insert<vkb::IntSetting>(2, reinterpret_cast<int &>(dependency_type), DependencyType::FRAG_TO_FRAG);
+
+#if defined(PLATFORM__MACOS) && TARGET_OS_IOS && TARGET_OS_SIMULATOR
+	// On iOS Simulator use layer setting to disable MoltenVK's Metal argument buffers - otherwise blank display
+	add_instance_extension(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME, /*optional*/ true);
+
+	VkLayerSettingEXT layerSetting;
+	layerSetting.pLayerName   = "MoltenVK";
+	layerSetting.pSettingName = "MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS";
+	layerSetting.type         = VK_LAYER_SETTING_TYPE_INT32_EXT;
+	layerSetting.valueCount   = 1;
+
+	// Make this static so layer setting reference remains valid after leaving constructor scope
+	static const int32_t useMetalArgumentBuffers = 0;
+	layerSetting.pValues                         = &useMetalArgumentBuffers;
+
+	add_layer_setting(layerSetting);
+#endif
 }
 
 bool PipelineBarriers::prepare(const vkb::ApplicationOptions &options)
diff --git a/samples/performance/subpasses/subpasses.cpp b/samples/performance/subpasses/subpasses.cpp
@@ -50,6 +50,23 @@ Subpasses::Subpasses()
 	config.insert<vkb::IntSetting>(3, configs[Config::RenderTechnique].value, 0);
 	config.insert<vkb::IntSetting>(3, configs[Config::TransientAttachments].value, 0);
 	config.insert<vkb::IntSetting>(3, configs[Config::GBufferSize].value, 1);
+
+#if defined(PLATFORM__MACOS) && TARGET_OS_IOS && TARGET_OS_SIMULATOR
+	// On iOS Simulator use layer setting to disable MoltenVK's Metal argument buffers - otherwise blank display
+	add_instance_extension(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME, /*optional*/ true);
+
+	VkLayerSettingEXT layerSetting;
+	layerSetting.pLayerName   = "MoltenVK";
+	layerSetting.pSettingName = "MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS";
+	layerSetting.type         = VK_LAYER_SETTING_TYPE_INT32_EXT;
+	layerSetting.valueCount   = 1;
+
+	// Make this static so layer setting reference remains valid after leaving constructor scope
+	static const int32_t useMetalArgumentBuffers = 0;
+	layerSetting.pValues                         = &useMetalArgumentBuffers;
+
+	add_layer_setting(layerSetting);
+#endif
 }
 
 std::unique_ptr<vkb::RenderTarget> Subpasses::create_render_target(vkb::core::Image &&swapchain_image)
diff --git a/samples/tooling/profiles/profiles.cpp b/samples/tooling/profiles/profiles.cpp
@@ -165,37 +165,27 @@ std::unique_ptr<vkb::Instance> Profiles::create_instance()
 		enabled_extensions.push_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
 		create_info.flags |= VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
 	}
+#endif
 
-#	if defined(PLATFORM__MACOS) && TARGET_OS_OSX
-	// On macOS use layer setting to configure MoltenVK for using Metal argument buffers (needed for descriptor indexing/scaling)
-	VkLayerSettingEXT            layerSetting{};
-	const int32_t                useMetalArgumentBuffers = 1;
-	VkLayerSettingsCreateInfoEXT layerSettingsCreateInfo{};
+#if defined(PLATFORM__MACOS)
+	// On Apple use layer setting to enable MoltenVK's Metal argument buffers - needed for descriptor indexing/scaling
+	enabled_extensions.push_back(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME);
 
-	if (std::ranges::any_of(available_instance_extensions,
-	                        [](VkExtensionProperties const &extension) { return strcmp(extension.extensionName, VK_EXT_LAYER_SETTINGS_EXTENSION_NAME) == 0; }))
-	{
-		enabled_extensions.push_back(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME);
+	VkLayerSettingEXT layerSetting{};
+	layerSetting.pLayerName   = "MoltenVK";
+	layerSetting.pSettingName = "MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS";
+	layerSetting.type         = VK_LAYER_SETTING_TYPE_INT32_EXT;
+	layerSetting.valueCount   = 1;
 
-		layerSetting.pLayerName   = "MoltenVK";
-		layerSetting.pSettingName = "MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS";
-		layerSetting.type         = VK_LAYER_SETTING_TYPE_INT32_EXT;
-		layerSetting.valueCount   = 1;
-		layerSetting.pValues      = &useMetalArgumentBuffers;
+	const int32_t useMetalArgumentBuffers = 1;
+	layerSetting.pValues                  = &useMetalArgumentBuffers;
 
-		layerSettingsCreateInfo.sType        = VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT;
-		layerSettingsCreateInfo.settingCount = 1;
-		layerSettingsCreateInfo.pSettings    = &layerSetting;
+	VkLayerSettingsCreateInfoEXT layerSettingsCreateInfo{};
+	layerSettingsCreateInfo.sType        = VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT;
+	layerSettingsCreateInfo.settingCount = 1;
+	layerSettingsCreateInfo.pSettings    = &layerSetting;
 
-		create_info.pNext = &layerSettingsCreateInfo;
-	}
-	else
-	{
-		// If layer settings is not available at runtime, set macOS environment variable for support of older Vulkan SDKs
-		// Will not work in batch mode, but is the best we can do short of using the deprecated MoltenVK private config API
-		setenv("MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS", "1", 1);
-	}
-#	endif
+	create_info.pNext = &layerSettingsCreateInfo;
 #endif
 
 	create_info.sType                   = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
diff --git a/shaders/dynamic_rendering_local_read/scene_opaque.vert b/shaders/dynamic_rendering_local_read/scene_opaque.vert
@@ -1,5 +1,5 @@
 #version 450
-/* Copyright (c) 2024, Sascha Willems
+/* Copyright (c) 2024-2025, Sascha Willems
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-layout (location = 0) in vec4 inPos;
+layout (location = 0) in vec3 inPos;
 layout (location = 1) in vec3 inNormal;
 
 layout (binding = 0) uniform UBO 
@@ -39,10 +39,10 @@ void main()
 {
 	mat4 nodeMat = ubo.model * sceneNode.matrix;
 
-	gl_Position = ubo.projection * ubo.view * nodeMat * inPos;
+	gl_Position = ubo.projection * ubo.view * nodeMat * vec4(inPos, 1.0);
 	
 	// Vertex position in world space
-	outWorldPos = vec3(sceneNode.matrix * inPos);
+	outWorldPos = vec3(sceneNode.matrix * vec4(inPos, 1.0));
 	// GL to Vulkan coord space
 	outWorldPos.y = -outWorldPos.y;
 	
diff --git a/shaders/dynamic_rendering_local_read/scene_opaque.vert.spv b/shaders/dynamic_rendering_local_read/scene_opaque.vert.spv
diff --git a/shaders/dynamic_rendering_local_read/scene_transparent.vert b/shaders/dynamic_rendering_local_read/scene_transparent.vert
@@ -1,5 +1,5 @@
 #version 450
-/* Copyright (c) 2024, Sascha Willems
+/* Copyright (c) 2024-2025, Sascha Willems
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-layout (location = 0) in vec4 inPos;
+layout (location = 0) in vec3 inPos;
 layout (location = 1) in vec3 inNormal;
 layout (location = 2) in vec2 inUV;
 
diff --git a/shaders/dynamic_rendering_local_read/scene_transparent.vert.spv b/shaders/dynamic_rendering_local_read/scene_transparent.vert.spv
