components/x11/mesa/patches/07-disable-sync.patch

   1 Patch for a clean build on Solaris
   2
   3 not suitable for upstream
   4
   5 --- src/mesa/drivers/dri/i965/brw_sync.c        2019-03-04 14:01:27.980943410 -0800
   6 +++ src/mesa/drivers/dri/i965/brw_sync.c        2019-03-04 14:01:48.370898259 -0800
   7 @@ -38,7 +38,9 @@
   8   * performance bottleneck, though.
   9   */
  10
  11 +#ifdef SYNC_IOC_MERGE
  12  #include <libsync.h> /* Requires Android or libdrm-2.4.72 */
  13 +#endif
  14
  15  #include "main/imports.h"
  16
  17 --- src/mesa/drivers/dri/i965/brw_sync.c      2019-05-16 08:45:58.414498243 -0700
  18 +++ src/mesa/drivers/dri/i965/brw_sync.c     2019-05-16 08:44:44.903512588 -0700
  19 @@ -222,8 +222,10 @@
  20     case BRW_FENCE_TYPE_SYNC_FD:
  21        assert(fence->sync_fd != -1);
  22
  23 +#ifdef SYNC_IOC_MERGE
  24        if (sync_wait(fence->sync_fd, 0) == -1)
  25           return false;
  26 +#endif
  27
  28        fence->signalled = true;
  29
  30 @@ -286,9 +288,12 @@
  31        else
  32           timeout_i32 = timeout;
  33
  34 +#ifdef SYNC_IOC_MERGE
  35        if (sync_wait(fence->sync_fd, timeout_i32) == -1)
  36           return false;
  37
  38 +#endif
  39 +
  40        fence->signalled = true;
  41        return true;
  42     }
  43