nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Vulkan: FIX bindlessAccelerationStructures destroy call when raytracing is not supported. (#318)

Browse Source 
Remove unused destroyer_bindlessUniformBuffers.
This commit is contained in:
Amer Koleci
2021-09-21 16:50:07 +02:00
committed by GitHub
parent cacb1e1a56
commit 963bcecd23
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/wiGraphicsDevice_Vulkan.h
+12 -16
View File
@@ -372,8 +372,8 @@ namespace wiGraphics
struct BindlessDescriptorHeap
{
VkDescriptorPool descriptorPool = VK_NULL_HANDLE;
VkDescriptorSetLayout descriptorSetLayout = VK_NULL_HANDLE;
VkDescriptorPool descriptorPool = VK_NULL_HANDLE;
VkDescriptorSet descriptorSet = VK_NULL_HANDLE;
std::vector<int> freelist;
std::mutex locker;
@@ -438,8 +438,17 @@ namespace wiGraphics
}
void destroy(VkDevice device)
{
vkDestroyDescriptorPool(device, descriptorPool, nullptr);
vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);
if (descriptorSetLayout != VK_NULL_HANDLE)
{
vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);
descriptorSetLayout = VK_NULL_HANDLE;
}
if (descriptorPool != VK_NULL_HANDLE)
{
vkDestroyDescriptorPool(device, descriptorPool, nullptr);
descriptorPool = VK_NULL_HANDLE;
}
}
int allocate()
@@ -485,7 +494,6 @@ namespace wiGraphics
std::deque<std::pair<VkRenderPass, uint64_t>> destroyer_renderpasses;
std::deque<std::pair<VkFramebuffer, uint64_t>> destroyer_framebuffers;
std::deque<std::pair<VkQueryPool, uint64_t>> destroyer_querypools;
std::deque<std::pair<int, uint64_t>> destroyer_bindlessUniformBuffers;
std::deque<std::pair<int, uint64_t>> destroyer_bindlessSampledImages;
std::deque<std::pair<int, uint64_t>> destroyer_bindlessUniformTexelBuffers;
std::deque<std::pair<int, uint64_t>> destroyer_bindlessStorageBuffers;
@@ -709,18 +717,6 @@ namespace wiGraphics
break;
}
}
while (!destroyer_bindlessUniformBuffers.empty())
{
if (destroyer_bindlessUniformBuffers.front().second + BUFFERCOUNT < FRAMECOUNT)
{
int index= destroyer_bindlessUniformBuffers.front().first;
destroyer_bindlessUniformBuffers.pop_front();
}
else
{
break;
}
}
while (!destroyer_bindlessSampledImages.empty())
{
if (destroyer_bindlessSampledImages.front().second + BUFFERCOUNT < FRAMECOUNT)