Merge branch 'main' into feature/mobile_nerf_rayquery

KhronosGroup · Aug 30, 2024 · b1f0fd0 · b1f0fd0
2 parents 1fcb6b8 + 46a89dd
commit b1f0fd0
Show file tree

Hide file tree

Showing 168 changed files with 1,412 additions and 1,662 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,10 +9,12 @@ tests/system_test/tmp
 output/*
 .mypy_cache
 tags
-.DS_Store
 
 # vim backup and temp files
 *~
 .*.sw*
 .sw*
 .tracy
+
+# macOS
+.DS_Store
diff --git a/app/ios/Storyboard.storyboard b/app/ios/Storyboard.storyboard
@@ -34,7 +34,7 @@ limitations under the License.
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </view>
                     <connections>
                         <outlet property="vulkan_view" destination="5EZ-qb-Rvc" id="XCX-oU-713"/>
@@ -45,9 +45,4 @@ limitations under the License.
             <point key="canvasLocation" x="-218" y="4"/>
         </scene>
     </scenes>
-    <resources>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-    </resources>
 </document>
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
@@ -250,7 +250,6 @@ set(CORE_FILES
     core/query_pool.h
     core/acceleration_structure.h
     core/hpp_allocated.h
-    core/hpp_buffer.h
     core/hpp_command_buffer.h
     core/hpp_command_pool.h
     core/hpp_debug.h
@@ -289,7 +288,6 @@ set(CORE_FILES
     core/swapchain.cpp
     core/command_buffer.cpp
     core/allocated.cpp
-    core/buffer.cpp
     core/image_core.cpp
     core/image_view.cpp
     core/sampled_image.cpp
@@ -299,7 +297,6 @@ set(CORE_FILES
     core/render_pass.cpp
     core/query_pool.cpp
     core/acceleration_structure.cpp
-    core/hpp_buffer.cpp
     core/hpp_command_buffer.cpp
     core/hpp_command_pool.cpp
     core/hpp_debug.cpp

diff --git a/framework/api_vulkan_sample.cpp b/framework/api_vulkan_sample.cpp
@@ -973,7 +973,7 @@ void ApiVulkanSample::handle_surface_changes()
 	}
 }
 
-VkDescriptorBufferInfo ApiVulkanSample::create_descriptor(vkb::core::Buffer &buffer, VkDeviceSize size, VkDeviceSize offset)
+VkDescriptorBufferInfo ApiVulkanSample::create_descriptor(vkb::core::BufferC &buffer, VkDeviceSize size, VkDeviceSize offset)
 {
 	VkDescriptorBufferInfo descriptor{};
 	descriptor.buffer = buffer.get_handle();
@@ -1025,7 +1025,7 @@ Texture ApiVulkanSample::load_texture(const std::string &file, vkb::sg::Image::C
 
 	VkCommandBuffer command_buffer = get_device().create_command_buffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 
-	vkb::core::Buffer stage_buffer = vkb::core::Buffer::create_staging_buffer(get_device(), texture.image->get_data());
+	vkb::core::BufferC stage_buffer = vkb::core::BufferC::create_staging_buffer(get_device(), texture.image->get_data());
 
 	// Setup buffer copy regions for each mip level
 	std::vector<VkBufferImageCopy> bufferCopyRegions;
@@ -1121,7 +1121,7 @@ Texture ApiVulkanSample::load_texture_array(const std::string &file, vkb::sg::Im
 
 	VkCommandBuffer command_buffer = get_device().create_command_buffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 
-	vkb::core::Buffer stage_buffer = vkb::core::Buffer::create_staging_buffer(get_device(), texture.image->get_data());
+	vkb::core::BufferC stage_buffer = vkb::core::BufferC::create_staging_buffer(get_device(), texture.image->get_data());
 
 	// Setup buffer copy regions for each mip level
 	std::vector<VkBufferImageCopy> buffer_copy_regions;
@@ -1220,7 +1220,7 @@ Texture ApiVulkanSample::load_texture_cubemap(const std::string &file, vkb::sg::
 
 	VkCommandBuffer command_buffer = get_device().create_command_buffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 
-	vkb::core::Buffer stage_buffer = vkb::core::Buffer::create_staging_buffer(get_device(), texture.image->get_data());
+	vkb::core::BufferC stage_buffer = vkb::core::BufferC::create_staging_buffer(get_device(), texture.image->get_data());
 
 	// Setup buffer copy regions for each mip level
 	std::vector<VkBufferImageCopy> buffer_copy_regions;

diff --git a/framework/api_vulkan_sample.h b/framework/api_vulkan_sample.h
@@ -200,7 +200,7 @@ class ApiVulkanSample : public vkb::VulkanSampleC
 	 * @param size The size of the descriptor (default: VK_WHOLE_SIZE)
 	 * @param offset The offset of the descriptor (default: 0)
 	 */
-	VkDescriptorBufferInfo create_descriptor(vkb::core::Buffer &buffer, VkDeviceSize size = VK_WHOLE_SIZE, VkDeviceSize offset = 0);
+	VkDescriptorBufferInfo create_descriptor(vkb::core::BufferC &buffer, VkDeviceSize size = VK_WHOLE_SIZE, VkDeviceSize offset = 0);
 
 	/**
 	 * @brief Creates an image descriptor

diff --git a/framework/buffer_pool.h b/framework/buffer_pool.h
@@ -20,7 +20,6 @@
 
 #include "core/buffer.h"
 #include "core/device.h"
-#include "core/hpp_buffer.h"
 #include "core/hpp_device.h"
 
 namespace vkb
@@ -35,27 +34,25 @@ class BufferAllocation
   public:
 	using DeviceSizeType = typename std::conditional<bindingType == vkb::BindingType::Cpp, vk::DeviceSize, VkDeviceSize>::type;
 
-	using BufferType = typename std::conditional<bindingType == vkb::BindingType::Cpp, vkb::core::HPPBuffer, vkb::core::Buffer>::type;
-
   public:
 	BufferAllocation()                                    = default;
 	BufferAllocation(const BufferAllocation &)            = delete;
 	BufferAllocation(BufferAllocation &&)                 = default;
 	BufferAllocation &operator=(const BufferAllocation &) = delete;
 	BufferAllocation &operator=(BufferAllocation &&)      = default;
 
-	BufferAllocation(BufferType &buffer, DeviceSizeType size, DeviceSizeType offset);
+	BufferAllocation(vkb::core::Buffer<bindingType> &buffer, DeviceSizeType size, DeviceSizeType offset);
 
-	bool           empty() const;
-	BufferType    &get_buffer();
-	DeviceSizeType get_offset() const;
-	DeviceSizeType get_size() const;
-	void           update(const std::vector<uint8_t> &data, uint32_t offset = 0);
+	bool                            empty() const;
+	vkb::core::Buffer<bindingType> &get_buffer();
+	DeviceSizeType                  get_offset() const;
+	DeviceSizeType                  get_size() const;
+	void                            update(const std::vector<uint8_t> &data, uint32_t offset = 0);
 	template <typename T>
 	void update(const T &value, uint32_t offset = 0);
 
   private:
-	vkb::core::HPPBuffer *buffer = nullptr;
+	vkb::core::BufferCpp *buffer = nullptr;
 	vk::DeviceSize        offset = 0;
 	vk::DeviceSize        size   = 0;
 };
@@ -64,15 +61,15 @@ using BufferAllocationC   = BufferAllocation<vkb::BindingType::C>;
 using BufferAllocationCpp = BufferAllocation<vkb::BindingType::Cpp>;
 
 template <>
-inline BufferAllocation<vkb::BindingType::Cpp>::BufferAllocation(vkb::core::HPPBuffer &buffer, vk::DeviceSize size, vk::DeviceSize offset) :
+inline BufferAllocation<vkb::BindingType::Cpp>::BufferAllocation(vkb::core::BufferCpp &buffer, vk::DeviceSize size, vk::DeviceSize offset) :
     buffer(&buffer),
     offset(offset),
     size(size)
 {}
 
 template <>
-inline BufferAllocation<vkb::BindingType::C>::BufferAllocation(vkb::core::Buffer &buffer, VkDeviceSize size, VkDeviceSize offset) :
-    buffer(reinterpret_cast<vkb::core::HPPBuffer *>(&buffer)),
+inline BufferAllocation<vkb::BindingType::C>::BufferAllocation(vkb::core::BufferC &buffer, VkDeviceSize size, VkDeviceSize offset) :
+    buffer(reinterpret_cast<vkb::core::BufferCpp *>(&buffer)),
     offset(static_cast<vk::DeviceSize>(offset)),
     size(static_cast<vk::DeviceSize>(size))
 {}
@@ -84,7 +81,7 @@ bool BufferAllocation<bindingType>::empty() const
 }
 
 template <vkb::BindingType bindingType>
-typename BufferAllocation<bindingType>::BufferType &BufferAllocation<bindingType>::get_buffer()
+typename vkb::core::Buffer<bindingType> &BufferAllocation<bindingType>::get_buffer()
 {
 	assert(buffer && "Invalid buffer pointer");
 	if constexpr (bindingType == vkb::BindingType::Cpp)
@@ -93,7 +90,7 @@ typename BufferAllocation<bindingType>::BufferType &BufferAllocation<bindingType
 	}
 	else
 	{
-		return reinterpret_cast<vkb::core::Buffer &>(*buffer);
+		return reinterpret_cast<vkb::core::BufferC &>(*buffer);
 	}
 }
 
@@ -190,7 +187,7 @@ class BufferBlock
 	vk::DeviceSize determine_alignment(vk::BufferUsageFlags usage, vk::PhysicalDeviceLimits const &limits) const;
 
   private:
-	vkb::core::HPPBuffer buffer;
+	vkb::core::BufferCpp buffer;
 	vk::DeviceSize       alignment = 0;        // Memory alignment, it may change according to the usage
 	vk::DeviceSize       offset    = 0;        // Current offset, it increases on every allocation
 };
@@ -227,7 +224,7 @@ BufferAllocation<bindingType> BufferBlock<bindingType>::allocate(DeviceSizeType
 		}
 		else
 		{
-			return BufferAllocationC{reinterpret_cast<vkb::core::Buffer &>(buffer), static_cast<VkDeviceSize>(size), static_cast<VkDeviceSize>(aligned)};
+			return BufferAllocationC{reinterpret_cast<vkb::core::BufferC &>(buffer), static_cast<VkDeviceSize>(size), static_cast<VkDeviceSize>(aligned)};
 		}
 	}
 

diff --git a/framework/common/utils.cpp b/framework/common/utils.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2023, Arm Limited and Contributors
+/* Copyright (c) 2018-2024, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -56,11 +56,11 @@ void screenshot(RenderContext &render_context, const std::string &filename)
 	auto height   = render_context.get_surface_extent().height;
 	auto dst_size = width * height * 4;
 
-	core::Buffer dst_buffer{render_context.get_device(),
-	                        dst_size,
-	                        VK_BUFFER_USAGE_TRANSFER_DST_BIT,
-	                        VMA_MEMORY_USAGE_GPU_TO_CPU,
-	                        VMA_ALLOCATION_CREATE_MAPPED_BIT};
+	vkb::core::BufferC dst_buffer{render_context.get_device(),
+	                              dst_size,
+	                              VK_BUFFER_USAGE_TRANSFER_DST_BIT,
+	                              VMA_MEMORY_USAGE_GPU_TO_CPU,
+	                              VMA_ALLOCATION_CREATE_MAPPED_BIT};
 
 	const auto &queue = render_context.get_device().get_queue_by_flags(VK_QUEUE_GRAPHICS_BIT, 0);
 

diff --git a/framework/core/acceleration_structure.cpp b/framework/core/acceleration_structure.cpp
@@ -38,9 +38,9 @@ AccelerationStructure::~AccelerationStructure()
 	}
 }
 
-uint64_t AccelerationStructure::add_triangle_geometry(std::unique_ptr<vkb::core::Buffer> &vertex_buffer,
-                                                      std::unique_ptr<vkb::core::Buffer> &index_buffer,
-                                                      std::unique_ptr<vkb::core::Buffer> &transform_buffer,
+uint64_t AccelerationStructure::add_triangle_geometry(vkb::core::BufferC &vertex_buffer,
+                                                      vkb::core::BufferC &index_buffer,
+                                                      vkb::core::BufferC &transform_buffer,
                                                       uint32_t triangle_count, uint32_t max_vertex,
                                                       VkDeviceSize vertex_stride, uint32_t transform_offset,
                                                       VkFormat vertex_format, VkGeometryFlagsKHR flags,
@@ -57,45 +57,19 @@ uint64_t AccelerationStructure::add_triangle_geometry(std::unique_ptr<vkb::core:
 	geometry.geometry.triangles.maxVertex                   = max_vertex;
 	geometry.geometry.triangles.vertexStride                = vertex_stride;
 	geometry.geometry.triangles.indexType                   = VK_INDEX_TYPE_UINT32;
-	geometry.geometry.triangles.vertexData.deviceAddress    = vertex_buffer_data_address == 0 ? vertex_buffer->get_device_address() : vertex_buffer_data_address;
-	geometry.geometry.triangles.indexData.deviceAddress     = index_buffer_data_address == 0 ? index_buffer->get_device_address() : index_buffer_data_address;
-	geometry.geometry.triangles.transformData.deviceAddress = transform_buffer_data_address == 0 ? transform_buffer->get_device_address() : transform_buffer_data_address;
+	geometry.geometry.triangles.vertexData.deviceAddress    = vertex_buffer_data_address == 0 ? vertex_buffer.get_device_address() : vertex_buffer_data_address;
+	geometry.geometry.triangles.indexData.deviceAddress     = index_buffer_data_address == 0 ? index_buffer.get_device_address() : index_buffer_data_address;
+	geometry.geometry.triangles.transformData.deviceAddress = transform_buffer_data_address == 0 ? transform_buffer.get_device_address() : transform_buffer_data_address;
 
 	uint64_t index = geometries.size();
 	geometries.insert({index, {geometry, triangle_count, transform_offset}});
 	return index;
 }
 
-uint64_t AccelerationStructure::add_triangle_geometry(vkb::core::Buffer const &vertex_buffer,
-                                                      vkb::core::Buffer const &index_buffer,
-                                                      vkb::core::Buffer const &transform_buffer,
-                                                      uint32_t triangle_count, uint32_t max_vertex,
-                                                      VkDeviceSize vertex_stride, uint32_t transform_offset,
-                                                      VkFormat vertex_format, VkIndexType index_type,
-                                                      VkGeometryFlagsKHR flags)
-{
-	VkAccelerationStructureGeometryKHR geometry{};
-	geometry.sType                                          = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_KHR;
-	geometry.geometryType                                   = VK_GEOMETRY_TYPE_TRIANGLES_KHR;
-	geometry.flags                                          = flags;
-	geometry.geometry.triangles.sType                       = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR;
-	geometry.geometry.triangles.vertexFormat                = vertex_format;
-	geometry.geometry.triangles.maxVertex                   = max_vertex;
-	geometry.geometry.triangles.vertexStride                = vertex_stride;
-	geometry.geometry.triangles.indexType                   = index_type;
-	geometry.geometry.triangles.vertexData.deviceAddress    = vertex_buffer.get_device_address();
-	geometry.geometry.triangles.indexData.deviceAddress     = index_buffer.get_device_address();
-	geometry.geometry.triangles.transformData.deviceAddress = transform_buffer.get_device_address();
-
-	uint64_t index = geometries.size();
-	geometries.insert({index, {geometry, triangle_count, transform_offset}});
-	return index;
-}
-
-void AccelerationStructure::update_triangle_geometry(uint64_t                            triangleUUID,
-                                                     std::unique_ptr<vkb::core::Buffer> &vertex_buffer,
-                                                     std::unique_ptr<vkb::core::Buffer> &index_buffer,
-                                                     std::unique_ptr<vkb::core::Buffer> &transform_buffer,
+void AccelerationStructure::update_triangle_geometry(uint64_t                             triangleUUID,
+                                                     std::unique_ptr<vkb::core::BufferC> &vertex_buffer,
+                                                     std::unique_ptr<vkb::core::BufferC> &index_buffer,
+                                                     std::unique_ptr<vkb::core::BufferC> &transform_buffer,
                                                      uint32_t triangle_count, uint32_t max_vertex,
                                                      VkDeviceSize vertex_stride, uint32_t transform_offset,
                                                      VkFormat vertex_format, VkGeometryFlagsKHR flags,
@@ -120,7 +94,7 @@ void AccelerationStructure::update_triangle_geometry(uint64_t
 	geometries[triangleUUID].updated                         = true;
 }
 
-uint64_t AccelerationStructure::add_instance_geometry(std::unique_ptr<vkb::core::Buffer> &instance_buffer, uint32_t instance_count, uint32_t transform_offset, VkGeometryFlagsKHR flags)
+uint64_t AccelerationStructure::add_instance_geometry(std::unique_ptr<vkb::core::BufferC> &instance_buffer, uint32_t instance_count, uint32_t transform_offset, VkGeometryFlagsKHR flags)
 {
 	VkAccelerationStructureGeometryKHR geometry{};
 	geometry.sType                                 = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_KHR;
@@ -135,8 +109,8 @@ uint64_t AccelerationStructure::add_instance_geometry(std::unique_ptr<vkb::core:
 	return index;
 }
 
-void AccelerationStructure::update_instance_geometry(uint64_t                            instance_UID,
-                                                     std::unique_ptr<vkb::core::Buffer> &instance_buffer,
+void AccelerationStructure::update_instance_geometry(uint64_t                             instance_UID,
+                                                     std::unique_ptr<vkb::core::BufferC> &instance_buffer,
                                                      uint32_t instance_count, uint32_t transform_offset,
                                                      VkGeometryFlagsKHR flags)
 {
@@ -202,7 +176,7 @@ void AccelerationStructure::build(VkQueue queue, VkBuildAccelerationStructureFla
 	// Create a buffer for the acceleration structure
 	if (!buffer || buffer->get_size() != build_sizes_info.accelerationStructureSize)
 	{
-		buffer = std::make_unique<vkb::core::Buffer>(
+		buffer = std::make_unique<vkb::core::BufferC>(
 		    device,
 		    build_sizes_info.accelerationStructureSize,
 		    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
@@ -228,7 +202,7 @@ void AccelerationStructure::build(VkQueue queue, VkBuildAccelerationStructureFla
 	device_address                                         = vkGetAccelerationStructureDeviceAddressKHR(device.get_handle(), &acceleration_device_address_info);
 
 	// Create a scratch buffer as a temporary storage for the acceleration structure build
-	scratch_buffer = std::make_unique<vkb::core::Buffer>(
+	scratch_buffer = std::make_unique<vkb::core::BufferC>(
 	    device,
 	    build_sizes_info.buildScratchSize,
 	    VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,