Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Vulkan: Need to count allocated descsets per frame separately from the map, since tess isn't even in-frame cached.

Browse Source
This commit is contained in:
Henrik Rydgård 2018-02-24 12:15:22 +01:00
parent c2c5b42354
commit 5d77c63216
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GPU/Vulkan/DrawEngineVulkan.cpp
View File

@ -304,6 +304,7 @@ void DrawEngineVulkan::BeginFrame() {
if (frame->descPool != VK_NULL_HANDLE) if (frame->descPool != VK_NULL_HANDLE)
vkResetDescriptorPool(vulkan_->GetDevice(), frame->descPool, 0); vkResetDescriptorPool(vulkan_->GetDevice(), frame->descPool, 0);
frame->descSets.Clear(); frame->descSets.Clear();
frame->descCount = 0;
descDecimationCounter_ = DESCRIPTORSET_DECIMATION_INTERVAL; descDecimationCounter_ = DESCRIPTORSET_DECIMATION_INTERVAL;
} }
@ -443,13 +444,14 @@ VkDescriptorSet DrawEngineVulkan::GetOrCreateDescriptorSet(VkImageView imageView
return d; return d;
} }
if (!frame.descPool || frame.descPoolSize < frame.descSets.size() + 1) { if (!frame.descPool || frame.descPoolSize < frame.descCount + 1) {
// Reallocate this desc pool larger, and "wipe" the cache. We might lose a tiny bit of descriptor set reuse but // Reallocate this desc pool larger, and "wipe" the cache. We might lose a tiny bit of descriptor set reuse but
// only for this frame. // only for this frame.
if (frame.descPool) { if (frame.descPool) {
DEBUG_LOG(G3D, "Reallocating desc pool from %d to %d", frame.descPoolSize, frame.descPoolSize * 2); DEBUG_LOG(G3D, "Reallocating desc pool from %d to %d", frame.descPoolSize, frame.descPoolSize * 2);
vulkan_->Delete().QueueDeleteDescriptorPool(frame.descPool); vulkan_->Delete().QueueDeleteDescriptorPool(frame.descPool);
frame.descSets.Clear(); frame.descSets.Clear();
frame.descCount = 0;
} }
frame.descPoolSize *= 2; frame.descPoolSize *= 2;
@ -579,6 +581,7 @@ VkDescriptorSet DrawEngineVulkan::GetOrCreateDescriptorSet(VkImageView imageView
if (!tess) // Again, avoid caching when HW tessellation. if (!tess) // Again, avoid caching when HW tessellation.
frame.descSets.Insert(key, desc); frame.descSets.Insert(key, desc);
frame.descCount++;
return desc; return desc;
} }

1
GPU/Vulkan/DrawEngineVulkan.h
View File

@ -232,6 +232,7 @@ private:
FrameData() : descSets(512) {} FrameData() : descSets(512) {}
VkDescriptorPool descPool = VK_NULL_HANDLE; VkDescriptorPool descPool = VK_NULL_HANDLE;
int descCount = 0;
int descPoolSize = 256; // We double this before we allocate so we initialize this to half the size we want. int descPoolSize = 256; // We double this before we allocate so we initialize this to half the size we want.
VulkanPushBuffer *pushUBO = nullptr; VulkanPushBuffer *pushUBO = nullptr;