get stuff to compile again

Author: devsh

include/nbl/asset/IAccelerationStructure.h

@@ -103,11 +103,8 @@ class IBottomLevelAccelerationStructure : public IAccelerationStructure
 			public:
 				using buffer_t = BufferType;
 				constexpr static inline GeometryType Type = GeometryType::Triangles;
-				
-			private:
-				constexpr static inline bool HostTransform = std::is_same_v<buffer_t,ICPUBuffer>;
 
-			public:
+				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>>;
 
@@ -146,7 +143,7 @@ class IBottomLevelAccelerationStructure : public IAccelerationStructure
 		struct AABBs
 		{
 			using buffer_t = BufferType;
-			constexpr static inline GeometryType Type = GeometryType::Triangles;
+			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 = {};

src/nbl/video/CVulkanAccelerationStructure.h

@@ -137,7 +137,7 @@ void getVkASGeometryFrom(const IGPUBottomLevelAccelerationStructure::Triangles<B
 		outBase.geometry.triangles.transformData = DummyNonNullAddress;
 	else
 	{
-		if constexpr (triangles.Host)
+		if constexpr (triangles.HostTransform)
 			outBase.geometry.triangles.transformData.hostAddress = &triangles.transform;
 		else
 			outBase.geometry.triangles.transformData = getVkDeviceOrHostAddress<const IGPUBuffer>(triangles.transform);
@@ -147,7 +147,7 @@ void getVkASGeometryFrom(const IGPUBottomLevelAccelerationStructure::Triangles<B
 template<Buffer BufferType, bool QueryOnly=false>
 void getVkASGeometryFrom(const IGPUBottomLevelAccelerationStructure::Triangles<BufferType>& triangles, VkAccelerationStructureGeometryKHR& outBase, VkAccelerationStructureGeometryMotionTrianglesDataNV* &p_vertexMotion)
 {
-	getVkASGeometryFrom<const BufferType,QueryOnly>(triangles,outBase);
+	getVkASGeometryFrom<BufferType,QueryOnly>(triangles,outBase);
 	if (triangles.vertexData[1].buffer)
 	{
 		p_vertexMotion->sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_MOTION_TRIANGLES_DATA_NV;