commit 1db76e030a158d3a752a41fdd3974732b8b65fb2
author Chia-I Wu <olvaffe@gmail.com> Mon Sep 15 14:21:14 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Tue Sep 23 15:27:35 2014 +0800
tree badc6ed681d702fa5145254c1430e91116a835ad
parent b8dceae4d32fb2a84999f1db561408534c48e56d

intel: add support for XGL_WSI_X11

icd/intel/fence.c

diff --git a/icd/intel/fence.c b/icd/intel/fence.c
index 481403a..5db0558 100644
--- a/icd/intel/fence.c
+++ b/icd/intel/fence.c
@@ -28,6 +28,7 @@
 #include "kmd/winsys.h"
 #include "cmd.h"
 #include "dev.h"
+#include "wsi_x11.h"
 #include "fence.h"
 
 static void fence_destroy(struct intel_obj *obj)
@@ -62,16 +63,21 @@
 
 XGL_RESULT intel_fence_wait(struct intel_fence *fence, int64_t timeout_ns)
 {
-    struct intel_bo *bo = (fence->cmd) ?
-        intel_cmd_get_batch(fence->cmd, NULL) : NULL;
-    int err;
+    if (fence->cmd) {
+        struct intel_bo *bo = intel_cmd_get_batch(fence->cmd, NULL);
 
-    if (!bo)
-        return XGL_ERROR_UNAVAILABLE;
+        return (intel_bo_wait(bo, timeout_ns)) ? XGL_NOT_READY : XGL_SUCCESS;
+    }
 
-    err = intel_bo_wait(bo, timeout_ns);
+#ifdef ENABLE_WSI_X11
+    if (fence->x11) {
+        const bool wait = (timeout_ns != 0);
 
-    return (err) ? XGL_NOT_READY : XGL_SUCCESS;
+        return intel_wsi_x11_wait(fence->x11, fence->x11_serial, wait);
+    }
+#endif
+
+    return XGL_ERROR_UNAVAILABLE;
 }
 
 XGL_RESULT XGLAPI intelCreateFence(