i915: reference __DRI_ATTRIB_SWAP_COPY token over the GLX one

[mesa.git] / src / mesa / drivers / dri / i915 / intel_syncobj.c

diff --git a/src/mesa/drivers/dri/i915/intel_syncobj.c b/src/mesa/drivers/dri/i915/intel_syncobj.c
index ae3ad82169222d9af2e3a3983e9aa2542eac724e..4839164ed97bd23846bc7ba8bc139a9cf9a40dda 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_syncobj.c
+++ b/src/mesa/drivers/dri/i915/intel_syncobj.c
@@ -38,7 +38,6 @@
  * performance bottleneck, though.
  */
 
-#include "util/simple_list.h"
 #include "main/imports.h"
 
 #include "intel_context.h"
@@ -46,9 +45,11 @@
 #include "intel_reg.h"
 
 struct intel_fence {
+   struct intel_context *intel;
    /** The fence waits for completion of this batch. */
    drm_intel_bo *batch_bo;
 
+   mtx_t mutex;
    bool signalled;
 };
 
@@ -77,7 +78,7 @@ intel_fence_insert(struct intel_context *intel, struct intel_fence *fence)
 }
 
 static bool
-intel_fence_has_completed(struct intel_fence *fence)
+intel_fence_has_completed_locked(struct intel_fence *fence)
 {
    if (fence->signalled)
       return true;
@@ -92,13 +93,21 @@ intel_fence_has_completed(struct intel_fence *fence)
    return false;
 }
 
-/**
- * Return true if the function successfully signals or has already signalled.
- * (This matches the behavior expected from __DRI2fence::client_wait_sync).
- */
 static bool
-intel_fence_client_wait(struct intel_context *intel, struct intel_fence *fence,
-                      uint64_t timeout)
+intel_fence_has_completed(struct intel_fence *fence)
+{
+   bool ret;
+
+   mtx_lock(&fence->mutex);
+   ret = intel_fence_has_completed_locked(fence);
+   mtx_unlock(&fence->mutex);
+
+   return ret;
+}
+
+static bool
+intel_fence_client_wait_locked(struct intel_context *intel, struct intel_fence *fence,
+                             uint64_t timeout)
 {
    if (fence->signalled)
       return true;
@@ -123,6 +132,23 @@ intel_fence_client_wait(struct intel_context *intel, struct intel_fence *fence,
    return true;
 }
 
+/**
+ * Return true if the function successfully signals or has already signalled.
+ * (This matches the behavior expected from __DRI2fence::client_wait_sync).
+ */
+static bool
+intel_fence_client_wait(struct intel_context *intel, struct intel_fence *fence,
+                      uint64_t timeout)
+{
+   bool ret;
+
+   mtx_lock(&fence->mutex);
+   ret = intel_fence_client_wait_locked(intel, fence, timeout);
+   mtx_unlock(&fence->mutex);
+
+   return ret;
+}
+
 static void
 intel_fence_server_wait(struct intel_context *intel, struct intel_fence *fence)
 {
@@ -134,7 +160,7 @@ intel_fence_server_wait(struct intel_context *intel, struct intel_fence *fence)
 }
 
 static struct gl_sync_object *
-intel_gl_new_sync_object(struct gl_context *ctx, GLuint id)
+intel_gl_new_sync_object(struct gl_context *ctx)
 {
    struct intel_gl_sync_object *sync;
 
@@ -215,6 +241,8 @@ intel_dri_create_fence(__DRIcontext *ctx)
    if (!fence)
       return NULL;
 
+   mtx_init(&fence->mutex, mtx_plain);
+   fence->intel = intel;
    intel_fence_insert(intel, fence);
 
    return fence;
@@ -233,19 +261,23 @@ static GLboolean
 intel_dri_client_wait_sync(__DRIcontext *ctx, void *driver_fence, unsigned flags,
                            uint64_t timeout)
 {
-   struct intel_context *intel = ctx->driverPrivate;
    struct intel_fence *fence = driver_fence;
 
-   return intel_fence_client_wait(intel, fence, timeout);
+   return intel_fence_client_wait(fence->intel, fence, timeout);
 }
 
 static void
 intel_dri_server_wait_sync(__DRIcontext *ctx, void *driver_fence, unsigned flags)
 {
-   struct intel_context *intel = ctx->driverPrivate;
    struct intel_fence *fence = driver_fence;
 
-   intel_fence_server_wait(intel, fence);
+   /* We might be called here with a NULL fence as a result of WaitSyncKHR
+    * on a EGL_KHR_reusable_sync fence. Nothing to do here in such case.
+    */
+   if (!fence)
+      return;
+
+   intel_fence_server_wait(fence->intel, fence);
 }
 
 const __DRI2fenceExtension intelFenceExtension = {