Ticket #54236: patch-support-egl_dri2.diff

src/egl/drivers/dri2/

@@ -58 +58 @@
 #include "egl_dri2.h"
 #include "util/u_atomic.h"
 
+#ifdef __MACH__
+#include <mach/mach.h>
+#include <mach/mach_time.h>
+#include <sys/sysctl.h>
+#endif
+
 /* The kernel header drm_fourcc.h defines the DRM formats below.  We duplicate
  * some of the definitions here so that building Mesa won't bleeding-edge
  * kernel headers.
@@ -2475 +2481 @@
          return NULL;
       }
 
+#ifndef __MACH__
       /* change clock attribute to CLOCK_MONOTONIC */
       ret = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);
+#endif
 
       if (ret) {
          _eglError(EGL_BAD_ACCESS, "eglCreateSyncKHR");
@@ -2594 +2602 @@
       } else {
          /* if reusable sync has not been yet signaled */
          if (dri2_sync->base.SyncStatus != EGL_SIGNALED_KHR) {
+#ifndef __MACH__
             clock_gettime(CLOCK_MONOTONIC, &current);
+#else
+                  static int calibrated = 0;
+                  static mach_timebase_info_data_t sTimebaseInfo;
+                  if (!calibrated) {
+                          mach_timebase_info(&sTimebaseInfo);
+                          calibrated = 1;
+                  }
+                  unsigned long long now = mach_absolute_time() * sTimebaseInfo.numer / sTimebaseInfo.denom;
+                  current.tv_sec = now / 1000000000;
+                  current.tv_nsec = now % 1000000000;
+#endif
 
             /* calculating when to expire */
             expire.nsec = timeout % 1000000000L;