X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2Fmain%2Feglsync.h;h=5ac76f3ac3dfd3e64fa67135e3c3308f33b9f3aa;hb=9594667899e2e04d625901ea703a44d8c4b4737c;hp=a0025237e7aaa1e499f6c8b3ec2495c9f8316bd6;hpb=dbf3a15313eed930a3d8fdde12e457259c43651b;p=mesa.git

diff --git a/src/egl/main/eglsync.h b/src/egl/main/eglsync.h
index a0025237e7a..5ac76f3ac3d 100644
--- a/src/egl/main/eglsync.h
+++ b/src/egl/main/eglsync.h
@@ -1,14 +1,41 @@
+/**************************************************************************
+ *
+ * Copyright 2010 LunarG, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+
 #ifndef EGLSYNC_INCLUDED
 #define EGLSYNC_INCLUDED
 
 
+#include "c99_compat.h"
+
 #include "egltypedefs.h"
 #include "egldisplay.h"
 
 
-#ifdef EGL_KHR_reusable_sync
-
-
 /**
  * "Base" class for device driver syncs.
  */
@@ -20,23 +47,25 @@ struct _egl_sync
    EGLenum Type;
    EGLenum SyncStatus;
    EGLenum SyncCondition;
+   EGLAttrib CLEvent;
+   EGLint SyncFd;
 };
 
 
-PUBLIC EGLBoolean
+extern EGLBoolean
 _eglInitSync(_EGLSync *sync, _EGLDisplay *dpy, EGLenum type,
-             const EGLint *attrib_list);
+             const EGLAttrib *attrib_list);
 
 
 extern EGLBoolean
-_eglGetSyncAttribKHR(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync,
-                     EGLint attribute, EGLint *value);
+_eglGetSyncAttrib(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync,
+                  EGLint attribute, EGLAttrib *value);
 
 
 /**
  * Increment reference count for the sync.
  */
-static INLINE _EGLSync *
+static inline _EGLSync *
 _eglGetSync(_EGLSync *sync)
 {
    if (sync)
@@ -48,7 +77,7 @@ _eglGetSync(_EGLSync *sync)
 /**
  * Decrement reference count for the sync.
  */
-static INLINE EGLBoolean
+static inline EGLBoolean
 _eglPutSync(_EGLSync *sync)
 {
    return (sync) ? _eglPutResource(&sync->Resource) : EGL_FALSE;
@@ -59,18 +88,18 @@ _eglPutSync(_EGLSync *sync)
  * Link a sync to its display and return the handle of the link.
  * The handle can be passed to client directly.
  */
-static INLINE EGLSyncKHR
+static inline EGLSync
 _eglLinkSync(_EGLSync *sync)
 {
    _eglLinkResource(&sync->Resource, _EGL_RESOURCE_SYNC);
-   return (EGLSyncKHR) sync;
+   return (EGLSync) sync;
 }
 
 
 /**
  * Unlink a linked sync from its display.
  */
-static INLINE void
+static inline void
 _eglUnlinkSync(_EGLSync *sync)
 {
    _eglUnlinkResource(&sync->Resource, _EGL_RESOURCE_SYNC);
@@ -81,8 +110,8 @@ _eglUnlinkSync(_EGLSync *sync)
  * Lookup a handle to find the linked sync.
  * Return NULL if the handle has no corresponding linked sync.
  */
-static INLINE _EGLSync *
-_eglLookupSync(EGLSyncKHR handle, _EGLDisplay *dpy)
+static inline _EGLSync *
+_eglLookupSync(EGLSync handle, _EGLDisplay *dpy)
 {
    _EGLSync *sync = (_EGLSync *) handle;
    if (!dpy || !_eglCheckResource((void *) sync, _EGL_RESOURCE_SYNC, dpy))
@@ -94,16 +123,13 @@ _eglLookupSync(EGLSyncKHR handle, _EGLDisplay *dpy)
 /**
  * Return the handle of a linked sync, or EGL_NO_SYNC_KHR.
  */
-static INLINE EGLSyncKHR
+static inline EGLSync
 _eglGetSyncHandle(_EGLSync *sync)
 {
    _EGLResource *res = (_EGLResource *) sync;
    return (res && _eglIsResourceLinked(res)) ?
-      (EGLSyncKHR) sync : EGL_NO_SYNC_KHR;
+      (EGLSync) sync : EGL_NO_SYNC_KHR;
 }
 
 
-#endif /* EGL_KHR_reusable_sync */
-
-
 #endif /* EGLSYNC_INCLUDED */