Merge pull request #869 from Devsh-Graphics-Programming/AS_conv2

Acceleration Structure Asset Conversion

Author: devshgraphicsprogramming

examples_tests

@@ -20,60 +20,63 @@
 namespace nbl::asset
 {
 
-class IAccelerationStructure : public IDescriptor
+class IAccelerationStructure : public virtual core::IReferenceCounted
 {
 	public:
+		// build flags, we don't expose flags that don't make sense for certain levels
+		enum class BUILD_FLAGS : uint8_t
+		{
+			ALLOW_UPDATE_BIT = 0x1u << 0u,
+			ALLOW_COMPACTION_BIT = 0x1u << 1u,
+			PREFER_FAST_TRACE_BIT = 0x1u << 2u,
+			PREFER_FAST_BUILD_BIT = 0x1u << 3u,
+			LOW_MEMORY_BIT = 0x1u << 4u,
+			// Provided by VK_NV_ray_tracing_motion_blur, but is ignored for BLASes and we always override and deduce from TLAS creation flag because of
+			// https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkAccelerationStructureBuildGeometryInfoKHR-dstAccelerationStructure-04927
+			//MOTION_BIT = 0x1u<<5u,
+			ALL_MASK = (01u<<5u)-1, 
+		};
+
 		// we don't expose the GENERIC type because Vulkan only intends it for API-translation layers like VKD3D or MoltenVK
 		virtual bool isBLAS() const = 0;
 
-		//!
-		inline E_CATEGORY getTypeCategory() const override { return EC_ACCELERATION_STRUCTURE; }
+		virtual bool usesMotion() const = 0;
 
 	protected:
 		IAccelerationStructure() = default;
 };
 
-template<class AccelerationStructure>
-class IBottomLevelAccelerationStructure : public AccelerationStructure
+NBL_ENUM_ADD_BITWISE_OPERATORS(IAccelerationStructure::BUILD_FLAGS);
+
+// To avoid having duplicate instantiations of flags, etc.
+class IBottomLevelAccelerationStructure : public IAccelerationStructure
 {
-		static_assert(std::is_base_of_v<IAccelerationStructure,AccelerationStructure>);
+		using base_build_flags_t = IAccelerationStructure::BUILD_FLAGS;
+
 	public:
-		inline bool isBLAS() const override {return true;}
+		inline bool isBLAS() const override { return true; }
 
 		// build flags, we don't expose flags that don't make sense for certain levels
 		enum class BUILD_FLAGS : uint16_t
 		{
-			ALLOW_UPDATE_BIT = 0x1u<<0u,
-			ALLOW_COMPACTION_BIT = 0x1u<<1u,
-			PREFER_FAST_TRACE_BIT = 0x1u<<2u,
-			PREFER_FAST_BUILD_BIT = 0x1u<<3u,
-			LOW_MEMORY_BIT = 0x1u<<4u,
+			ALLOW_UPDATE_BIT = base_build_flags_t::ALLOW_UPDATE_BIT,
+			ALLOW_COMPACTION_BIT = base_build_flags_t::ALLOW_COMPACTION_BIT,
+			PREFER_FAST_TRACE_BIT = base_build_flags_t::PREFER_FAST_TRACE_BIT,
+			PREFER_FAST_BUILD_BIT = base_build_flags_t::PREFER_FAST_BUILD_BIT,
+			LOW_MEMORY_BIT = base_build_flags_t::LOW_MEMORY_BIT,
 			// Synthetic flag we use to indicate that the build data are AABBs instead of triangles, we've taken away the per-geometry choice thanks to:
 			// https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkAccelerationStructureBuildGeometryInfoKHR-type-03792
 			GEOMETRY_TYPE_IS_AABB_BIT = 0x1u<<5u,
-			// Provided by VK_NV_ray_tracing_motion_blur, but is ignored for BLASes
-			//MOTION_BIT = 0x1u<<5u
 			// Provided by VK_EXT_opacity_micromap
 			ALLOW_OPACITY_MICROMAP_UPDATE_BIT = 0x1u<<6u,
 			ALLOW_DISABLE_OPACITY_MICROMAPS_BIT = 0x1u<<7u,
 			ALLOW_OPACITY_MICROMAP_DATA_UPDATE_BIT = 0x1u<<8u,
 			// Provided by VK_NV_displacement_micromap
 			ALLOW_DISPLACEMENT_MICROMAP_UPDATE_BIT = 0x1u<<9u,
 			// Provided by VK_KHR_ray_tracing_position_fetch
-			ALLOW_DATA_ACCESS_KHR = 0x1u<<11u,
+			ALLOW_DATA_ACCESS = 0x1u<<11u,
 		};
-		static inline bool validBuildFlags(const core::bitflag<BUILD_FLAGS> flags)
-		{
-			// https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkAccelerationStructureBuildGeometryInfoKHR-flags-03796
-			if (flags.hasFlags(BUILD_FLAGS::PREFER_FAST_BUILD_BIT) && flags.hasFlags(BUILD_FLAGS::PREFER_FAST_TRACE_BIT))
-				return false;
 
-			// https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkAccelerationStructureBuildGeometryInfoKHR-flags-07334
-			if (flags.hasFlags(BUILD_FLAGS::ALLOW_OPACITY_MICROMAP_UPDATE_BIT) && flags.hasFlags(BUILD_FLAGS::ALLOW_OPACITY_MICROMAP_DATA_UPDATE_BIT))
-				return false;
-
-			return true;
-		}
 
 		// Apparently Vulkan allows setting these on TLAS Geometry (which are instances) but applying them to a TLAS doesn't make any SENSE AT ALL!
 		enum class GEOMETRY_FLAGS : uint8_t
@@ -132,42 +135,40 @@ class IBottomLevelAccelerationStructure : public AccelerationStructure
 		using AABB_t = core::aabbox3d<float>;
 
 	protected:
-		using AccelerationStructure::AccelerationStructure;
+		using base_build_flags_t = IAccelerationStructure::BUILD_FLAGS;
+		using IAccelerationStructure::IAccelerationStructure;
 		virtual ~IBottomLevelAccelerationStructure() = default;
-};
-
-// forward declare for `static_assert`
-class ICPUBottomLevelAccelerationStructure;
 
-template<class AccelerationStructure>
-class ITopLevelAccelerationStructure : public AccelerationStructure
-{
-		static_assert(std::is_base_of_v<IAccelerationStructure,AccelerationStructure>);
-	public:
-		inline bool isBLAS() const override {return false;}
-
-		// build flags, we don't expose flags that don't make sense for certain levels
-		enum class BUILD_FLAGS : uint8_t
-		{
-			ALLOW_UPDATE_BIT = 0x1u<<0u,
-			ALLOW_COMPACTION_BIT = 0x1u<<1u,
-			PREFER_FAST_TRACE_BIT = 0x1u<<2u,
-			PREFER_FAST_BUILD_BIT = 0x1u<<3u,
-			LOW_MEMORY_BIT = 0x1u<<4u,
-			// Synthetic flag we use to indicate `VkAccelerationStructureGeometryInstancesDataKHR::arrayOfPointers`
-			INSTANCE_DATA_IS_POINTERS_TYPE_ENCODED_LSB = 0x1u<<5u, // this flag really shouldn't be settable outside of `video::IGPU`
-			// Provided by VK_NV_ray_tracing_motion_blur, but we always override and deduce from creation flag because of
-			// https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkAccelerationStructureBuildGeometryInfoKHR-dstAccelerationStructure-04927
-			//MOTION_BIT = 0x1u<<5u,
-		};
 		static inline bool validBuildFlags(const core::bitflag<BUILD_FLAGS> flags)
 		{
 			// https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkAccelerationStructureBuildGeometryInfoKHR-flags-03796
 			if (flags.hasFlags(BUILD_FLAGS::PREFER_FAST_BUILD_BIT) && flags.hasFlags(BUILD_FLAGS::PREFER_FAST_TRACE_BIT))
 				return false;
 
+			// https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkAccelerationStructureBuildGeometryInfoKHR-flags-07334
+			if (flags.hasFlags(BUILD_FLAGS::ALLOW_OPACITY_MICROMAP_UPDATE_BIT) && flags.hasFlags(BUILD_FLAGS::ALLOW_OPACITY_MICROMAP_DATA_UPDATE_BIT))
+				return false;
+
 			return true;
 		}
+};
+NBL_ENUM_ADD_BITWISE_OPERATORS(IBottomLevelAccelerationStructure::BUILD_FLAGS);
+
+// forward declare for `static_assert`
+class ICPUBottomLevelAccelerationStructure;
+
+class ITopLevelAccelerationStructure : public IDescriptor, public IAccelerationStructure
+{
+		using base_build_flags_t = IAccelerationStructure::BUILD_FLAGS;
+
+	public:
+		//!
+		inline E_CATEGORY getTypeCategory() const override {return EC_ACCELERATION_STRUCTURE;}
+
+		inline bool isBLAS() const override {return false;}
+
+		// No extra flags for TLAS builds
+		using BUILD_FLAGS = base_build_flags_t;
 
 		enum class INSTANCE_FLAGS : uint8_t
 		{
@@ -182,9 +183,10 @@ class ITopLevelAccelerationStructure : public AccelerationStructure
 			FORCE_DISABLE_OPACITY_MICROMAPS_BIT = 0x1u<<5u,
 		};
 		// Note: `core::matrix3x4SIMD` is equvalent to VkTransformMatrixKHR, 4x3 row_major matrix
-		template<typename blas_ref_t>
+		template<typename _blas_ref_t>
 		struct Instance final
 		{
+			using blas_ref_t = _blas_ref_t;
 			static_assert(sizeof(blas_ref_t)==8 && alignof(blas_ref_t)==8);
 			static_assert(std::is_same_v<core::smart_refctd_ptr<ICPUBottomLevelAccelerationStructure>,blas_ref_t> || std::is_standard_layout_v<blas_ref_t>);
 
@@ -237,7 +239,7 @@ class ITopLevelAccelerationStructure : public AccelerationStructure
 			static_assert(alignof(Instance<blas_ref_t>)==8ull);
 		};
 
-		// enum for distinguishing unions of Instance Types when there is no `INSTANCE_DATA_IS_POINTERS_TYPE_ENCODED_LSB` in build flags
+		// enum for distinguishing unions of Instance Types when using a polymorphic instance
 		enum class INSTANCE_TYPE : uint32_t
 		{
 			// StaticInstance
@@ -248,9 +250,33 @@ class ITopLevelAccelerationStructure : public AccelerationStructure
 			SRT_MOTION
 		};
 
+		static uint16_t getInstanceSize(const INSTANCE_TYPE type)
+		{
+			switch (type)
+			{
+				case INSTANCE_TYPE::SRT_MOTION:
+					return sizeof( SRTMotionInstance<ptrdiff_t>);
+					break;
+				case INSTANCE_TYPE::MATRIX_MOTION:
+					return sizeof(MatrixMotionInstance<ptrdiff_t>);
+					break;
+				default:
+					break;
+			}
+			return sizeof(StaticInstance<ptrdiff_t>);
+		}
+
 	protected:
-		using AccelerationStructure::AccelerationStructure;
+		using IAccelerationStructure::IAccelerationStructure;
 		virtual ~ITopLevelAccelerationStructure() = default;
+		
+		static inline bool validBuildFlags(const core::bitflag<BUILD_FLAGS> flags)
+		{
+			// https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkAccelerationStructureBuildGeometryInfoKHR-flags-03796
+			if (flags.hasFlags(BUILD_FLAGS::PREFER_FAST_BUILD_BIT) && flags.hasFlags(BUILD_FLAGS::PREFER_FAST_TRACE_BIT))
+				return false;
+			return true;
+		}
 };
 
 } // end namespace nbl::asset

include/nbl/asset/IAccelerationStructure.h

@@ -13,7 +13,7 @@
 namespace nbl::asset
 {
 
-class IBuffer : public core::IBuffer, public IDescriptor
+class IBuffer : public IDescriptor, public core::IBuffer
 {
 	public:
 		E_CATEGORY getTypeCategory() const override {return EC_BUFFER;}