Vulkan: Build a yarn::Scheduler and pass it down to the vk::Queue.
Nothing is actually scheduled, but is a first step towards using yarn.
As yarn is now actually used by SwiftShader, drop the BUILD_YARN build
flags, as failing to build yarn would result in linker errors.
Bug: b/139142453
Change-Id: Ibd9a69f72a248f58a62bb41eeb196c4647876e82
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/35153
Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
diff --git a/src/Vulkan/VkQueue.cpp b/src/Vulkan/VkQueue.cpp
index e654ca0..329847d 100644
--- a/src/Vulkan/VkQueue.cpp
+++ b/src/Vulkan/VkQueue.cpp
@@ -19,6 +19,11 @@
#include "WSI/VkSwapchainKHR.hpp"
#include "Device/Renderer.hpp"
+#include "Yarn/Defer.hpp"
+#include "Yarn/Scheduler.hpp"
+#include "Yarn/Thread.hpp"
+#include "Yarn/Trace.hpp"
+
#include <cstring>
namespace
@@ -74,9 +79,9 @@
namespace vk
{
-Queue::Queue(Device* device) : device(device)
+Queue::Queue(Device* device, yarn::Scheduler *scheduler) : device(device)
{
- queueThread = std::thread(&Queue::taskLoop, this);
+ queueThread = std::thread(&Queue::taskLoop, this, scheduler);
}
Queue::~Queue()
@@ -155,8 +160,12 @@
}
}
-void Queue::taskLoop()
+void Queue::taskLoop(yarn::Scheduler* scheduler)
{
+ yarn::Thread::setName("Queue<%p>", this);
+ scheduler->bind();
+ defer(scheduler->unbind());
+
while(true)
{
Task task = pending.take();
