Merge pull request #878 from Devsh-Graphics-Programming/more_asset_converter_for_tlas

Working and Tested Asset Converter for Acceleration Structures

Author: devshgraphicsprogramming

examples_tests

@@ -88,42 +88,62 @@ class IBottomLevelAccelerationStructure : public IAccelerationStructure
 			NO_DUPLICATE_ANY_HIT_INVOCATION_BIT	= 0x1u<<1u,
 		};
 
+		enum class GeometryType : uint8_t
+		{
+			Triangles = 0,
+			AABBs = 1,
+			// Later: LSS and friends
+			Count = 2
+		};
+
 		// Note that in Vulkan strides are 64-bit value but restricted to be 32-bit in range
-		template<typename BufferType> requires std::is_base_of_v<IBuffer,BufferType>
+		template<typename BufferType> requires (!std::is_const_v<BufferType> && std::is_base_of_v<IBuffer,BufferType>)
 		struct Triangles
 		{
-			using buffer_t = std::remove_const_t<BufferType>;
-			constexpr static inline bool Host = std::is_same_v<buffer_t,ICPUBuffer>;
-			// we make our life easier by not taking pointers to single matrix values
-			using transform_t = std::conditional_t<Host,hlsl::float32_t3x4,asset::SBufferBinding<const buffer_t>>;
-
-			inline bool hasTransform() const
-			{
-				if constexpr (Host)
-					return !core::isnan(transform[0][0]);
-				else
-					return bool(transform.buffer);
-			}
-
-			// optional, only useful for baking model transforms of multiple meshes into one BLAS
-			transform_t	transform = {};
-			// vertexData[1] are the vertex positions at time 1.0, and only used for AccelerationStructures created with `MOTION_BIT`
-			asset::SBufferBinding<const buffer_t>	vertexData[2] = {{},{}};
-			asset::SBufferBinding<const buffer_t>	indexData = {};
-			uint32_t								maxVertex = 0u;
-			// type implicitly satisfies: https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkAccelerationStructureGeometryTrianglesDataKHR-vertexStride-03819
-			uint32_t								vertexStride = sizeof(float);
-			E_FORMAT								vertexFormat = EF_R32G32B32_SFLOAT;
-			E_INDEX_TYPE							indexType = EIT_UNKNOWN;
-			core::bitflag<GEOMETRY_FLAGS>			geometryFlags = GEOMETRY_FLAGS::NONE;
-			// TODO: opacity and displacement micromap buffers and shizz
+			public:
+				using buffer_t = BufferType;
+				constexpr static inline GeometryType Type = GeometryType::Triangles;
+
+				constexpr static inline bool HostTransform = std::is_same_v<buffer_t,ICPUBuffer>;
+				// we make our life easier by not taking pointers to single matrix values
+				using transform_t = std::conditional_t<HostTransform,hlsl::float32_t3x4,asset::SBufferBinding<const buffer_t>>;
+
+				inline bool hasTransform() const
+				{
+					if constexpr (HostTransform)
+						return !core::isnan(transform[0][0]);
+					else
+						return bool(transform.buffer);
+				}
+
+				// optional, only useful for baking model transforms of multiple meshes into one BLAS
+				transform_t	transform = __transform_initializer();
+				// vertexData[1] are the vertex positions at time 1.0, and only used for AccelerationStructures created with `MOTION_BIT`
+				asset::SBufferBinding<const buffer_t>	vertexData[2] = {{},{}};
+				asset::SBufferBinding<const buffer_t>	indexData = {};
+				uint32_t								maxVertex = 0u;
+				// type implicitly satisfies: https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkAccelerationStructureGeometryTrianglesDataKHR-vertexStride-03819
+				uint32_t								vertexStride = sizeof(float);
+				E_FORMAT								vertexFormat = EF_R32G32B32_SFLOAT;
+				E_INDEX_TYPE							indexType = EIT_UNKNOWN;
+				core::bitflag<GEOMETRY_FLAGS>			geometryFlags = GEOMETRY_FLAGS::NONE;
+				// TODO: opacity and displacement micromap buffers and shizz
+
+			private:
+				constexpr static transform_t __transform_initializer()
+				{
+					if constexpr (HostTransform)
+						return hlsl::float32_t3x4(std::numeric_limits<float>::quiet_NaN());
+					return {};
+				}
 		};
 
 		//
-		template<typename BufferType> requires std::is_base_of_v<IBuffer,BufferType>
+		template<typename BufferType> requires (!std::is_const_v<BufferType> && std::is_base_of_v<IBuffer,BufferType>)
 		struct AABBs
 		{
-			using buffer_t = std::remove_const_t<BufferType>;
+			using buffer_t = BufferType;
+			constexpr static inline GeometryType Type = GeometryType::AABBs;
 
 			// for `MOTION_BIT` you don't get a second buffer for AABBs at different times because linear interpolation of AABBs doesn't work
 			asset::SBufferBinding<const BufferType>	data = {};

include/nbl/asset/IAccelerationStructure.h

@@ -140,7 +140,7 @@ class ICPUBottomLevelAccelerationStructure final : public IPreHashed, public IBo
 
 		inline core::blake3_hash_t computeContentHash() const override
 		{
-			if (!missingContent())
+			if (missingContent())
 				return INVALID_HASH;
 			const bool isAABB = m_buildFlags.hasFlags(BUILD_FLAGS::GEOMETRY_TYPE_IS_AABB_BIT);
 			core::blake3_hasher hasher;