From 42a694368e00f6b2fba434d37c1badfb6241c61a Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 7 May 2017 11:14:25 +0200 Subject: [PATCH] Vulkan: Remove obsolete warning suppressions. Increase descriptor pool sizes. --- GPU/Vulkan/DrawEngineVulkan.cpp | 4 ++-- Windows/GPU/WindowsVulkanContext.cpp | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp index d6a7f8a0f9..22cf8b3514 100644 --- a/GPU/Vulkan/DrawEngineVulkan.cpp +++ b/GPU/Vulkan/DrawEngineVulkan.cpp @@ -149,13 +149,13 @@ void DrawEngineVulkan::InitDeviceObjects() { VkDescriptorPoolSize dpTypes[2]; dpTypes[0].descriptorCount = 2048; dpTypes[0].type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC; - dpTypes[1].descriptorCount = 512; + dpTypes[1].descriptorCount = 2048; dpTypes[1].type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; VkDescriptorPoolCreateInfo dp = { VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO }; dp.pNext = nullptr; dp.flags = 0; // Don't want to mess around with individually freeing these, let's go fixed each frame and zap the whole array. Might try the dynamic approach later. - dp.maxSets = 1000; + dp.maxSets = 2048; dp.pPoolSizes = dpTypes; dp.poolSizeCount = ARRAY_SIZE(dpTypes); diff --git a/Windows/GPU/WindowsVulkanContext.cpp b/Windows/GPU/WindowsVulkanContext.cpp index 143d4f264d..5f82924a00 100644 --- a/Windows/GPU/WindowsVulkanContext.cpp +++ b/Windows/GPU/WindowsVulkanContext.cpp @@ -124,22 +124,11 @@ static VkBool32 VKAPI_CALL Vulkan_Dbg(VkDebugReportFlagsEXT msgFlags, VkDebugRep } message << "[" << pLayerPrefix << "] " << ObjTypeToString(objType) << " Code " << msgCode << " : " << pMsg << "\n"; - // layout barrier. TODO: This one I should fix. - if (msgCode == 7 && startsWith(pMsg, "Cannot submit cmd buffer")) - return false; - if (msgCode == 7 && startsWith(pMsg, "Cannot copy from an image")) - return false; - if (msgCode == 7 && startsWith(pMsg, "You cannot transition the layout")) - return false; // This seems like a bogus result when submitting two command buffers in one go, one creating the image, the other one using it. if (msgCode == 6 && startsWith(pMsg, "Cannot submit cmd buffer using image")) return false; - if (msgCode == 44 && startsWith(pMsg, "At Draw time the active render")) - return false; if (msgCode == 11) return false; - if (msgCode == 63 && startsWith(pMsg, "vkCmdClearAttachments() issued on command buffer ")) - return false; #ifdef _WIN32 std::string msg = message.str();