commit 073d271864cbf004a7cd5e03f74f2acf4fb6df6a
author Jim Van Verth <jvanverth@google.com> Mon Feb 03 16:10:17 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Feb 03 21:36:21 2020 +0000
tree 482c5cb3e1ca381db0ca3c8840c890d2a5d8cb99
parent d129e08366e774247dc09430480aafe10aa2a153

Fix timeout for Metal compiler.

dispatch_time() takes nanoseconds, not microseconds.

Change-Id: Ia292eef0373fc8e48e6cc900f106ddf438cd74f1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/268440
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/gpu/mtl/GrMtlUtil.mm

diff --git a/src/gpu/mtl/GrMtlUtil.mm b/src/gpu/mtl/GrMtlUtil.mm
index 5493a31..95bc2d4 100644
--- a/src/gpu/mtl/GrMtlUtil.mm
+++ b/src/gpu/mtl/GrMtlUtil.mm
@@ -143,8 +143,8 @@
                          options: options
                completionHandler: completionHandler];
 
-    // Wait 5 seconds for the compiler
-    if (dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 5000000UL))) {
+    // Wait 100 ms for the compiler
+    if (dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 100000000UL))) {
         SkDebugf("Timeout compiling MSL shader\n");
         return nil;
     }
@@ -171,8 +171,8 @@
     [device newRenderPipelineStateWithDescriptor: pipelineDescriptor
                                completionHandler: completionHandler];
 
-    // Wait 5 seconds for pipeline creation
-    if (dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 5000000UL))) {
+    // Wait 100 ms for pipeline creation
+    if (dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 100000000UL))) {
         SkDebugf("Timeout creating pipeline.\n");
         return nil;
     }