VkQueue: Destruct the object.
We were never destructing VkQueues, but were freeing the underlying memory.
Bug: b/133127573
Change-Id: Id6d9f615428073adad7267dd1bd48ced17f1b433
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/31592
Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
diff --git a/src/Vulkan/VkDevice.cpp b/src/Vulkan/VkDevice.cpp
index e51cf07..9717931 100644
--- a/src/Vulkan/VkDevice.cpp
+++ b/src/Vulkan/VkDevice.cpp
@@ -79,7 +79,7 @@
{
for(uint32_t i = 0; i < queueCount; i++)
{
- queues[i].destroy();
+ queues[i].~Queue();
}
vk::deallocate(queues, pAllocator);
diff --git a/src/Vulkan/VkQueue.cpp b/src/Vulkan/VkQueue.cpp
index 262bef6..f1ead9a 100644
--- a/src/Vulkan/VkQueue.cpp
+++ b/src/Vulkan/VkQueue.cpp
@@ -81,7 +81,7 @@
queueThread = std::thread(TaskLoop, this);
}
-void Queue::destroy()
+Queue::~Queue()
{
Task task;
task.type = Task::KILL_THREAD;
@@ -91,8 +91,6 @@
ASSERT_MSG(pending.count() == 0, "queue has work after worker thread shutdown");
garbageCollect();
-
- renderer.reset(nullptr);
}
VkResult Queue::submit(uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence)
diff --git a/src/Vulkan/VkQueue.hpp b/src/Vulkan/VkQueue.hpp
index f4180c3..4f0d6f8 100644
--- a/src/Vulkan/VkQueue.hpp
+++ b/src/Vulkan/VkQueue.hpp
@@ -37,14 +37,13 @@
public:
Queue();
- ~Queue() = delete;
+ ~Queue();
operator VkQueue()
{
return reinterpret_cast<VkQueue>(this);
}
- void destroy();
VkResult submit(uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence);
VkResult waitIdle();
#ifndef __ANDROID__
