libVulkan: Use new marl::Scheduler::Config API.

`marl::Scheduler::setWorkerThreadCount()` and `marl::Scheduler::setThreadInitializer()` have been deprecated. `marl::Scheduler::Config` is the new API. See https://github.com/google/marl/issues/139 for context. Bug: b/140546382 Change-Id: Ida768eea98a7ca5d22f55f5055ca288b41b353d0 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/45493Tested-by: Ben Clayton <bclayton@google.com> Presubmit-Ready: Ben Clayton <bclayton@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com>

libVulkan: Use new marl::Scheduler::Config API.
e817aaa4 · Ben Clayton · b42e1ed3 · e817aaa4
Commit e817aaa4 authored Jun 02, 2020 by Ben Clayton
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

libVulkan.cpp src/Vulkan/libVulkan.cpp +4 -3

No files found.
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -147,12 +147,13 @@ std::shared_ptr<marl::Scheduler> getOrCreateScheduler()
 	auto sptr = scheduler.weakptr.lock();
 	if(!sptr)
 	{
-		sptr = std::make_shared<marl::Scheduler>();
+		marl::Scheduler::Config cfg;
-		sptr->setThreadInitializer([] {
+		cfg.setWorkerThreadCount(std::min<size_t>(marl::Thread::numLogicalCPUs(), 16));
+		cfg.setWorkerThreadInitializer([](int) {
 			sw::CPUID::setFlushToZero(true);
 			sw::CPUID::setDenormalsAreZero(true);
 		});
-		sptr->setWorkerThreadCount(std::min<size_t>(marl::Thread::numLogicalCPUs(), 16));
+		sptr = std::make_shared<marl::Scheduler>(cfg);
 		scheduler.weakptr = sptr;
 	}
 	return sptr;