From 44bf7cf539949a6f26862201729fce5000b493f0 Mon Sep 17 00:00:00 2001 From: assiduous Date: Fri, 6 Nov 2020 20:25:14 -0800 Subject: Few minor updates to TLAS and BLAS implementations --- Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp | 4 ---- Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp | 6 +----- Graphics/GraphicsEngineVulkan/src/BottomLevelASVkImpl.cpp | 10 +++++----- 3 files changed, 6 insertions(+), 14 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp index e907337d..1a4eb2c1 100644 --- a/Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp +++ b/Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp @@ -50,9 +50,6 @@ public: bool bIsDeviceInternal = false); ~BottomLevelASVkImpl(); - /// Implementation of IBottomLevelAS::GetScratchBufferSizes() in Vulkan backend. - virtual ScratchBufferSizes DILIGENT_CALL_TYPE GetScratchBufferSizes() const override { return m_ScratchSize; } - /// Implementation of IBottomLevelAS::GetNativeHandle() in Vulkan backend. virtual void* DILIGENT_CALL_TYPE GetNativeHandle() override final { @@ -73,7 +70,6 @@ private: VulkanUtilities::AccelStructWrapper m_VulkanBLAS; VulkanUtilities::VulkanMemoryAllocation m_MemoryAllocation; VkDeviceSize m_MemoryAlignedOffset = 0; - ScratchBufferSizes m_ScratchSize; }; } // namespace Diligent diff --git a/Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp index 8f2b42ab..b55223df 100644 --- a/Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp +++ b/Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp @@ -51,8 +51,7 @@ public: bool bIsDeviceInternal = false); ~TopLevelASVkImpl(); - /// Implementation of ITopLevelAS::GetScratchBufferSizes() in Vulkan backend. - virtual ScratchBufferSizes DILIGENT_CALL_TYPE GetScratchBufferSizes() const override { return m_ScratchSize; } + IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_TopLevelASVk, TTopLevelASBase); /// Implementation of ITopLevelAS::GetNativeHandle() in Vulkan backend. virtual void* DILIGENT_CALL_TYPE GetNativeHandle() override final @@ -64,15 +63,12 @@ public: /// Implementation of ITopLevelASVk::GetVkTLAS(). virtual VkAccelerationStructureKHR DILIGENT_CALL_TYPE GetVkTLAS() const override { return m_VulkanTLAS; } - IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_TopLevelASVk, TTopLevelASBase); - const VkAccelerationStructureKHR* GetVkTLASPtr() const { return &m_VulkanTLAS; } private: VulkanUtilities::AccelStructWrapper m_VulkanTLAS; VulkanUtilities::VulkanMemoryAllocation m_MemoryAllocation; VkDeviceSize m_MemoryAlignedOffset = 0; - ScratchBufferSizes m_ScratchSize; }; } // namespace Diligent diff --git a/Graphics/GraphicsEngineVulkan/src/BottomLevelASVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/BottomLevelASVkImpl.cpp index cc16c9e4..092da523 100644 --- a/Graphics/GraphicsEngineVulkan/src/BottomLevelASVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/BottomLevelASVkImpl.cpp @@ -43,7 +43,7 @@ BottomLevelASVkImpl::BottomLevelASVkImpl(IReferenceCounters* pRefCounters, const auto& Limits = PhysicalDevice.GetExtProperties().RayTracing; VkAccelerationStructureCreateInfoKHR CreateInfo = {}; - std::vector Geometries; + std::vector vkGeometries; CreateInfo.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_KHR; CreateInfo.type = VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_KHR; @@ -56,8 +56,8 @@ BottomLevelASVkImpl::BottomLevelASVkImpl(IReferenceCounters* pRefCounters, else { CreateInfo.maxGeometryCount = m_Desc.TriangleCount + m_Desc.BoxCount; - Geometries.resize(CreateInfo.maxGeometryCount); - CreateInfo.pGeometryInfos = Geometries.data(); + vkGeometries.resize(CreateInfo.maxGeometryCount); + CreateInfo.pGeometryInfos = vkGeometries.data(); VERIFY_EXPR(CreateInfo.maxGeometryCount <= Limits.maxGeometryCount); @@ -68,7 +68,7 @@ BottomLevelASVkImpl::BottomLevelASVkImpl(IReferenceCounters* pRefCounters, for (uint32_t i = 0; i < m_Desc.TriangleCount; ++i) { auto& src = m_Desc.pTriangles[i]; - auto& dst = Geometries[i]; + auto& dst = vkGeometries[i]; dst.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_GEOMETRY_TYPE_INFO_KHR; dst.pNext = nullptr; @@ -89,7 +89,7 @@ BottomLevelASVkImpl::BottomLevelASVkImpl(IReferenceCounters* pRefCounters, for (uint32_t i = 0; i < m_Desc.BoxCount; ++i) { auto& src = m_Desc.pBoxes[i]; - auto& dst = Geometries[i]; + auto& dst = vkGeometries[i]; dst.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_GEOMETRY_TYPE_INFO_KHR; dst.pNext = nullptr; -- cgit v1.2.3