VkQueue: Use a sw::WaitGroup for waitIdle()

Don't (ab)use vk::Fence for its start() finish() events. sw::WaitGroup shares the same interface, so use that. Allows vk::Fence to have its destructor deleted again. Bug: b/133127573 Change-Id: I747ea6965bf85343c720235083b309d8b855a950 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/31684Tested-by: Ben Clayton <bclayton@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com>

VkQueue: Use a sw::WaitGroup for waitIdle()
8546d4e7 · Ben Clayton · bd0ab1be · 8546d4e7 · 8546d4e7
Commit 8546d4e7 authored May 20, 2019 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

VkFence.hpp src/Vulkan/VkFence.hpp +1 -0

VkQueue.cpp src/Vulkan/VkQueue.cpp +4 -4

No files found.
--- a/src/Vulkan/VkFence.hpp
+++ b/src/Vulkan/VkFence.hpp
@@ -75,6 +75,7 @@ public:

 private:
 	Fence(const Fence&) = delete;
+	~Fence() = delete;
 	Fence& operator = (const Fence&) = delete;

 	sw::WaitGroup wg;

--- a/src/Vulkan/VkQueue.cpp
+++ b/src/Vulkan/VkQueue.cpp
@@ -183,14 +183,14 @@ void Queue::taskLoop()
 VkResult Queue::waitIdle()
 {
 	// Wait for task queue to flush.
-	vk::Fence fence;
-	fence.start();
+	sw::WaitGroup wg;
+	wg.add();

 	Task task;
-	task.events = &fence;
+	task.events = &wg;
 	pending.put(task);

-	fence.wait();
+	wg.wait();

 	garbageCollect();