commit e693b62e6baebe8d909a69ab530ea7732f62f821
author Ben Clayton <bclayton@google.com> Thu Sep 05 12:48:37 2019 +0100
committer Ben Clayton <bclayton@google.com> Sat Sep 07 11:49:25 2019 +0000
tree e77f141ef424a4f4ffc74427e6acd7d942f0c57b
parent b6c572d0b1114e0159d742e8d89bc3609cf59bef

Migrate from yarn to marl.

Bug: b/140546382
Change-Id: I106cde639419fb49d5d161555f1baa687bb12e91
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/36111
Reviewed-by: Ben Clayton <bclayton@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

src/Vulkan/VkQueue.cpp

diff --git a/src/Vulkan/VkQueue.cpp b/src/Vulkan/VkQueue.cpp
index 329847d..8e41bbb 100644
--- a/src/Vulkan/VkQueue.cpp
+++ b/src/Vulkan/VkQueue.cpp
@@ -19,10 +19,10 @@
 #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 "marl/defer.h"
+#include "marl/scheduler.h"
+#include "marl/thread.h"
+#include "marl/trace.h"
 
 #include <cstring>
 
@@ -79,7 +79,7 @@
 namespace vk
 {
 
-Queue::Queue(Device* device, yarn::Scheduler *scheduler) : device(device)
+Queue::Queue(Device* device, marl::Scheduler *scheduler) : device(device)
 {
 	queueThread = std::thread(&Queue::taskLoop, this, scheduler);
 }
@@ -160,9 +160,9 @@
 	}
 }
 
-void Queue::taskLoop(yarn::Scheduler* scheduler)
+void Queue::taskLoop(marl::Scheduler* scheduler)
 {
-	yarn::Thread::setName("Queue<%p>", this);
+	marl::Thread::setName("Queue<%p>", this);
 	scheduler->bind();
 	defer(scheduler->unbind());