Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-03-04 04:07:08 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Vulkan: Remove obsolete warning suppressions. Increase descriptor pool sizes.

Browse Source
This commit is contained in:
Henrik Rydgard 2017-05-07 11:14:25 +02:00
parent d4e1fc8d93
commit 42a694368e
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GPU/Vulkan/DrawEngineVulkan.cpp
View File

@ -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);

11
Windows/GPU/WindowsVulkanContext.cpp
View File

@ -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();