From f38a6650b17ef04b2b93f229db3655f85c8344c9 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Thu, 7 Feb 2019 14:56:29 +0100 Subject: [PATCH] VK code cleanup: Just a little helper for handling dedicated allocation for images. --- Common/Vulkan/VulkanContext.cpp | 21 ++++++++++++ Common/Vulkan/VulkanContext.h | 2 ++ Common/Vulkan/VulkanDebug.cpp | 3 +- Common/Vulkan/VulkanImage.cpp | 19 +---------- ext/native/thin3d/VulkanRenderManager.cpp | 40 ++--------------------- 5 files changed, 28 insertions(+), 57 deletions(-) diff --git a/Common/Vulkan/VulkanContext.cpp b/Common/Vulkan/VulkanContext.cpp index 63ef9abd45..c71d9edbbe 100644 --- a/Common/Vulkan/VulkanContext.cpp +++ b/Common/Vulkan/VulkanContext.cpp @@ -1319,3 +1319,24 @@ void VulkanDeleteList::PerformDeletes(VkDevice device) { } descSetLayouts_.clear(); } + +void VulkanContext::GetImageMemoryRequirements(VkImage image, VkMemoryRequirements *mem_reqs, bool *dedicatedAllocation) { + if (DeviceExtensions().KHR_dedicated_allocation) { + VkImageMemoryRequirementsInfo2KHR memReqInfo2{VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR}; + memReqInfo2.image = image; + + VkMemoryRequirements2KHR memReq2 = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR}; + VkMemoryDedicatedRequirementsKHR memDedicatedReq{VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR}; + memReq2.pNext = &memDedicatedReq; + + vkGetImageMemoryRequirements2KHR(GetDevice(), &memReqInfo2, &memReq2); + + *mem_reqs = memReq2.memoryRequirements; + *dedicatedAllocation = + (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE) || + (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE); + } else { + vkGetImageMemoryRequirements(GetDevice(), image, mem_reqs); + *dedicatedAllocation = false; + } +} diff --git a/Common/Vulkan/VulkanContext.h b/Common/Vulkan/VulkanContext.h index 42ae79d132..01761aab6b 100644 --- a/Common/Vulkan/VulkanContext.h +++ b/Common/Vulkan/VulkanContext.h @@ -262,6 +262,8 @@ public: const VulkanDeviceExtensions &DeviceExtensions() { return extensionsLookup_; } + void GetImageMemoryRequirements(VkImage image, VkMemoryRequirements *mem_reqs, bool *dedicatedAllocation); + private: // A layer can expose extensions, keep track of those extensions here. struct LayerProperties { diff --git a/Common/Vulkan/VulkanDebug.cpp b/Common/Vulkan/VulkanDebug.cpp index 64538196ff..be7512b738 100644 --- a/Common/Vulkan/VulkanDebug.cpp +++ b/Common/Vulkan/VulkanDebug.cpp @@ -115,7 +115,6 @@ VkBool32 VKAPI_CALL VulkanDebugUtilsCallback( const char *pMessage = pCallbackData->pMessage; int messageCode = pCallbackData->messageIdNumber; const char *pLayerPrefix = ""; - // Ignore perf warnings for now. Could log them, so still want them registered. if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) { message << "ERROR("; } else if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) { @@ -135,7 +134,6 @@ VkBool32 VKAPI_CALL VulkanDebugUtilsCallback( } message << ":" << pCallbackData->messageIdNumber << ") " << pMessage << "\n"; - #ifdef _WIN32 std::string msg = message.str(); OutputDebugStringA(msg.c_str()); @@ -147,6 +145,7 @@ VkBool32 VKAPI_CALL VulkanDebugUtilsCallback( MessageBoxA(NULL, pMessage, "Alert", MB_OK); } } else if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) { + // Don't break on perf warnings for now, even with a debugger. We log them at least. if (options->breakOnWarning && IsDebuggerPresent() && 0 == (messageType & VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)) { DebugBreak(); } diff --git a/Common/Vulkan/VulkanImage.cpp b/Common/Vulkan/VulkanImage.cpp index 68b1801f67..4c4d2fcff1 100644 --- a/Common/Vulkan/VulkanImage.cpp +++ b/Common/Vulkan/VulkanImage.cpp @@ -72,25 +72,8 @@ bool VulkanTexture::CreateDirect(VkCommandBuffer cmd, int w, int h, int numMips, } VkMemoryRequirements mem_reqs{}; - bool dedicatedAllocation = false; - if (vulkan_->DeviceExtensions().KHR_dedicated_allocation) { - VkImageMemoryRequirementsInfo2KHR memReqInfo2{VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR}; - memReqInfo2.image = image_; - - VkMemoryRequirements2KHR memReq2 = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR}; - VkMemoryDedicatedRequirementsKHR memDedicatedReq{VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR}; - memReq2.pNext = &memDedicatedReq; - - vkGetImageMemoryRequirements2KHR(vulkan_->GetDevice(), &memReqInfo2, &memReq2); - - mem_reqs = memReq2.memoryRequirements; - dedicatedAllocation = - (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE) || - (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE); - } else { - vkGetImageMemoryRequirements(vulkan_->GetDevice(), image_, &mem_reqs); - } + vulkan_->GetImageMemoryRequirements(image_, &mem_reqs, &dedicatedAllocation); if (allocator_ && !dedicatedAllocation) { offset_ = allocator_->Allocate(mem_reqs, &mem_, Tag()); diff --git a/ext/native/thin3d/VulkanRenderManager.cpp b/ext/native/thin3d/VulkanRenderManager.cpp index c63e0dd412..dac2b50492 100644 --- a/ext/native/thin3d/VulkanRenderManager.cpp +++ b/ext/native/thin3d/VulkanRenderManager.cpp @@ -42,25 +42,8 @@ void CreateImage(VulkanContext *vulkan, VkCommandBuffer cmd, VKRImage &img, int vkCreateImage(vulkan->GetDevice(), &ici, nullptr, &img.image); VkMemoryRequirements memreq; - bool dedicatedAllocation = false; - if (vulkan->DeviceExtensions().KHR_dedicated_allocation) { - VkImageMemoryRequirementsInfo2KHR memReqInfo2{VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR}; - memReqInfo2.image = img.image; - - VkMemoryRequirements2KHR memReq2 = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR}; - VkMemoryDedicatedRequirementsKHR memDedicatedReq{VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR}; - memReq2.pNext = &memDedicatedReq; - - vkGetImageMemoryRequirements2KHR(vulkan->GetDevice(), &memReqInfo2, &memReq2); - - memreq = memReq2.memoryRequirements; - dedicatedAllocation = - (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE) || - (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE); - } else { - vkGetImageMemoryRequirements(vulkan->GetDevice(), img.image, &memreq); - } + vulkan->GetImageMemoryRequirements(img.image, &memreq, &dedicatedAllocation); VkMemoryAllocateInfo alloc{ VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO }; alloc.allocationSize = memreq.size; @@ -569,7 +552,6 @@ bool VulkanRenderManager::InitDepthStencilBuffer(VkCommandBuffer cmd) { image_info.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; image_info.flags = 0; - VkMemoryRequirements mem_reqs; depth_.format = depth_format; @@ -580,24 +562,8 @@ bool VulkanRenderManager::InitDepthStencilBuffer(VkCommandBuffer cmd) { return false; bool dedicatedAllocation = false; - if (vulkan_->DeviceExtensions().KHR_dedicated_allocation) { - VkImageMemoryRequirementsInfo2KHR memReqInfo2{VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR}; - memReqInfo2.image = depth_.image; - - VkMemoryRequirements2KHR memReq2 = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR}; - VkMemoryDedicatedRequirementsKHR memDedicatedReq{VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR}; - memReq2.pNext = &memDedicatedReq; - - vkGetImageMemoryRequirements2KHR(vulkan_->GetDevice(), &memReqInfo2, &memReq2); - - mem_reqs = memReq2.memoryRequirements; - dedicatedAllocation = - (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE) || - (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE); - } else { - vkGetImageMemoryRequirements(vulkan_->GetDevice(), depth_.image, &mem_reqs); - } - + VkMemoryRequirements mem_reqs; + vulkan_->GetImageMemoryRequirements(depth_.image, &mem_reqs, &dedicatedAllocation); VkMemoryAllocateInfo mem_alloc = {VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO}; mem_alloc.allocationSize = mem_reqs.size;