Merge branch 'KhronosGroup:main' into fgiancan-remove-vendored-cmake-module-find-vulkan

Author: fgiancane8

antora/modules/ROOT/nav.adoc

@@ -82,6 +82,7 @@
 ** xref:samples/extensions/portability/README.adoc[Portability]
 ** xref:samples/extensions/push_descriptors/README.adoc[Push descriptors]
 *** xref:samples/extensions/hpp_push_descriptors/README.adoc[Push descriptors (Vulkan-Hpp)]
+** xref:samples/extensions/rasterization_order_attachment_access/README.adoc[Rasterization order attachment access]
 ** xref:samples/extensions/ray_tracing_basic/README.adoc[Raytracing basic]
 ** xref:samples/extensions/ray_tracing_extended/README.adoc[Raytracing extended]
 ** xref:samples/extensions/ray_tracing_invocation_reorder/README.adoc[Ray tracing invocation reorder (SER)]
@@ -134,4 +135,4 @@
 ** xref:docs/build.adoc[Build guide]
 ** xref:docs/memory_limits.adoc[Memory limits]
 ** xref:docs/misc.adoc[Miscellaneous]
-* link:https://github.com/KhronosGroup/Vulkan-Samples[GitHub Repository, window=_blank]
+* link:https://github.com/KhronosGroup/Vulkan-Samples[GitHub Repository, window=_blank

bldsys/cmake/template/gradle/app.build.gradle.in

@@ -2,7 +2,7 @@ plugins {
 	id 'com.android.application'
 }
 
-ext.vvl_version='1.4.321.0'
+ext.vvl_version='1.4.341.0'
 apply from: "./download_vvl.gradle"
 
 android {
@@ -68,7 +68,7 @@ android {
 		abortOnError false
 		checkReleaseBuilds false
 	}
-	
+
 	buildFeatures {
 		viewBinding true
 		prefab true

bldsys/cmake/template/gradle/download_vvl.gradle

@@ -36,7 +36,7 @@ apply plugin: 'com.android.application'
  */
 
 // get the validation layer version.
-def VVL_VER = "1.4.321.0"
+def VVL_VER = "1.4.341.0"
 if (ext.has("vvl_version")) {
     VVL_VER = ext.vvl_version
 }

framework/CMakeLists.txt

@@ -110,17 +110,12 @@ set(RENDERING_FILES
     rendering/render_target.h
     rendering/subpass.h
     rendering/hpp_pipeline_state.h
-    rendering/hpp_render_pipeline.h
-    rendering/hpp_render_target.h
     # Source files
     rendering/pipeline_state.cpp
     rendering/postprocessing_pipeline.cpp
     rendering/postprocessing_pass.cpp
     rendering/postprocessing_renderpass.cpp
-    rendering/postprocessing_computepass.cpp
-    rendering/render_pipeline.cpp
-    rendering/render_target.cpp
-    rendering/hpp_render_target.cpp)
+    rendering/postprocessing_computepass.cpp)
 
 set(RENDERING_SUBPASSES_FILES
     # Header files
@@ -409,7 +404,7 @@ else()
 endif()
 
 # mask out the min/max macros from minwindef.h
-if(MSVC)
+if(WIN32)
     add_definitions(-DNOMINMAX)
 endif()
 

framework/builder_base.h

@@ -1,5 +1,5 @@
-/* Copyright (c) 2021-2025, NVIDIA CORPORATION. All rights reserved.
- * Copyright (c) 2025, Bradley Austin Davis. All rights reserved.
+/* Copyright (c) 2021-2026, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2025-2026, Bradley Austin Davis. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -103,11 +103,11 @@ class BuilderBase
 
   private:
 	// we always want to store a vk::CreateInfo, so we have to figure out that type, depending on the BindingType!
-	using HPPCreateInfoType = typename vkb::VulkanTypeMapping<bindingType, CreateInfoType>::Type;
+	using CreateInfoTypeCpp = typename vkb::VulkanTypeMapping<bindingType, CreateInfoType>::Type;
 
   protected:
 	VmaAllocationCreateInfo alloc_create_info = {};
-	HPPCreateInfoType       create_info       = {};
+	CreateInfoTypeCpp       create_info       = {};
 	std::string             debug_name        = {};
 };
 
@@ -118,7 +118,7 @@ using BuilderBaseCpp = BuilderBase<vkb::BindingType::Cpp, BuilderType, CreateInf
 
 template <vkb::BindingType bindingType, typename BuilderType, typename CreateInfoType>
 inline BuilderBase<bindingType, BuilderType, CreateInfoType>::BuilderBase(const CreateInfoType &create_info_) :
-    create_info{reinterpret_cast<HPPCreateInfoType const &>(create_info_)}
+    create_info{reinterpret_cast<CreateInfoTypeCpp const &>(create_info_)}
 {
 	alloc_create_info.usage = VMA_MEMORY_USAGE_AUTO;
 };
@@ -138,7 +138,7 @@ inline CreateInfoType const &BuilderBase<bindingType, BuilderType, CreateInfoTyp
 	}
 	else
 	{
-		return *reinterpret_cast<typename HPPCreateInfoType::NativeType const *>(&create_info);
+		return *reinterpret_cast<typename CreateInfoTypeCpp::NativeType const *>(&create_info);
 	}
 }
 
@@ -151,7 +151,7 @@ inline CreateInfoType &BuilderBase<bindingType, BuilderType, CreateInfoType>::ge
 	}
 	else
 	{
-		return *reinterpret_cast<typename HPPCreateInfoType::NativeType *>(&create_info);
+		return *reinterpret_cast<typename CreateInfoTypeCpp::NativeType *>(&create_info);
 	}
 }
 

framework/common/hpp_resource_caching.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2023-2025, NVIDIA CORPORATION. All rights reserved.
+/* Copyright (c) 2023-2026, NVIDIA CORPORATION. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -23,7 +23,6 @@
 #include "core/hpp_render_pass.h"
 #include "core/hpp_shader_module.h"
 #include "hpp_resource_record.h"
-#include "rendering/hpp_render_target.h"
 #include "resource_caching.h"
 #include <vulkan/vulkan_hash.hpp>
 
@@ -227,9 +226,9 @@ struct hash<vkb::core::HPPSubpassInfo>
 };
 
 template <>
-struct hash<vkb::rendering::HPPAttachment>
+struct hash<vkb::rendering::AttachmentCpp>
 {
-	size_t operator()(const vkb::rendering::HPPAttachment &attachment) const
+	size_t operator()(const vkb::rendering::AttachmentCpp &attachment) const
 	{
 		size_t result = 0;
 		vkb::hash_combine(result, attachment.format);
@@ -250,28 +249,18 @@ struct hash<vkb::rendering::HPPPipelineState>
 };
 
 template <>
-struct hash<vkb::rendering::HPPRenderTarget>
+struct hash<vkb::rendering::RenderTargetCpp>
 {
-	size_t operator()(const vkb::rendering::HPPRenderTarget &render_target) const
+	size_t operator()(const vkb::rendering::RenderTargetCpp &render_target) const
 	{
-		size_t result = 0;
-		vkb::hash_combine(result, render_target.get_extent());
+		std::size_t result = 0;
+
 		for (auto const &view : render_target.get_views())
 		{
-			vkb::hash_combine(result, view);
-		}
-		for (auto const &attachment : render_target.get_attachments())
-		{
-			vkb::hash_combine(result, attachment);
-		}
-		for (auto const &input : render_target.get_input_attachments())
-		{
-			vkb::hash_combine(result, input);
-		}
-		for (auto const &output : render_target.get_output_attachments())
-		{
-			vkb::hash_combine(result, output);
+			vkb::hash_combine(result, view.get_handle());
+			vkb::hash_combine(result, view.get_image().get_handle());
 		}
+
 		return result;
 	}
 };

framework/common/resource_caching.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2025, Arm Limited and Contributors
+/* Copyright (c) 2018-2026, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -22,6 +22,7 @@
 #include "core/descriptor_set_layout.h"
 #include "core/framebuffer.h"
 #include "core/image.h"
+#include "core/image_view.h"
 #include "core/pipeline.h"
 #include "rendering/pipeline_state.h"
 #include "rendering/render_target.h"
@@ -123,9 +124,9 @@ struct hash<vkb::RenderPass>
 };
 
 template <>
-struct hash<vkb::Attachment>
+struct hash<vkb::rendering::AttachmentC>
 {
-	std::size_t operator()(const vkb::Attachment &attachment) const
+	std::size_t operator()(const vkb::rendering::AttachmentC &attachment) const
 	{
 		std::size_t result = 0;
 
@@ -437,13 +438,13 @@ struct hash<vkb::ColorBlendAttachmentState>
 };
 
 template <>
-struct hash<vkb::RenderTarget>
+struct hash<vkb::rendering::RenderTargetC>
 {
-	std::size_t operator()(const vkb::RenderTarget &render_target) const
+	std::size_t operator()(const vkb::rendering::RenderTargetC &render_target) const
 	{
 		std::size_t result = 0;
 
-		for (auto &view : render_target.get_views())
+		for (auto const &view : render_target.get_views())
 		{
 			vkb::hash_combine(result, view.get_handle());
 			vkb::hash_combine(result, view.get_image().get_handle());
@@ -559,9 +560,9 @@ inline void hash_param<std::vector<uint8_t>>(
 }
 
 template <>
-inline void hash_param<std::vector<Attachment>>(
-    size_t                        &seed,
-    const std::vector<Attachment> &value)
+inline void hash_param<std::vector<vkb::rendering::AttachmentC>>(
+    size_t                                         &seed,
+    const std::vector<vkb::rendering::AttachmentC> &value)
 {
 	for (auto &attachment : value)
 	{

framework/core/allocated.h

@@ -1,6 +1,6 @@
-/* Copyright (c) 2021-2025, NVIDIA CORPORATION. All rights reserved.
- * Copyright (c) 2024-2025, Bradley Austin Davis. All rights reserved.
- * Copyright (c) 2025, Arm Limited and Contributors
+/* Copyright (c) 2021-2026, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2024-2026, Bradley Austin Davis. All rights reserved.
+ * Copyright (c) 2025-2026, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -36,15 +36,15 @@ VmaAllocator &get_memory_allocator();
 
 /**
  * @brief The non-templatized VMA initializer function, referenced by the template version to smooth
- * over the differences between the `vkb::Device` and `vkb::core::HPPDevice` classes.
+ * over the differences between the `vkb::core::Device<bindingType` classes.
  * Idempotent, but should be paired with `shutdown`.
  * @param create_info The VMA allocator create info.
  */
 void init(const VmaAllocatorCreateInfo &create_info);
 
 /**
  * @brief Initializes the VMA allocator with the specified device, expressed
- * as the `vkb` wrapper class, which might be `vkb::Device` or `vkb::core::HPPDevice`.
+ * as the `vkb` wrapper class, which might be `vkb::core::DeviceC` or `vkb::core::DeviceCpp`.
  * @tparam DeviceType The type of the device.
  * @param device The Vulkan device.
  */