egl: replace _EGLDriver with _EGLDisplay->Driver in _eglGetSyncAttrib()

[mesa.git] / src / egl / main / eglsync.h

diff --git a/src/egl/main/eglsync.h b/src/egl/main/eglsync.h
index 1a56889642e236ba6699af7566505a28c8c70338..4fdf15f231e6d2edda1edc41cd43b27b4c7a673a 100644 (file)
--- a/src/egl/main/eglsync.h
+++ b/src/egl/main/eglsync.h
@@ -30,13 +30,12 @@
 #define EGLSYNC_INCLUDED
 
 
+#include "c99_compat.h"
+
 #include "egltypedefs.h"
 #include "egldisplay.h"
 
 
-#ifdef EGL_KHR_reusable_sync
-
-
 /**
  * "Base" class for device driver syncs.
  */
@@ -48,23 +47,25 @@ struct _egl_sync
    EGLenum Type;
    EGLenum SyncStatus;
    EGLenum SyncCondition;
+   EGLAttrib CLEvent;
+   EGLint SyncFd;
 };
 
 
-PUBLIC EGLBoolean
-_eglInitSync(_EGLSync *sync, _EGLDisplay *dpy, EGLenum type,
-             const EGLint *attrib_list);
+extern EGLBoolean
+_eglInitSync(_EGLSync *sync, _EGLDisplay *disp, EGLenum type,
+             const EGLAttrib *attrib_list);
 
 
 extern EGLBoolean
-_eglGetSyncAttribKHR(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync,
-                     EGLint attribute, EGLint *value);
+_eglGetSyncAttrib(_EGLDisplay *disp, _EGLSync *sync,
+                  EGLint attribute, EGLAttrib *value);
 
 
 /**
  * Increment reference count for the sync.
  */
-static INLINE _EGLSync *
+static inline _EGLSync *
 _eglGetSync(_EGLSync *sync)
 {
    if (sync)
@@ -76,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;
@@ -87,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);
@@ -109,11 +110,11 @@ _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 *disp)
 {
    _EGLSync *sync = (_EGLSync *) handle;
-   if (!dpy || !_eglCheckResource((void *) sync, _EGL_RESOURCE_SYNC, dpy))
+   if (!disp || !_eglCheckResource((void *) sync, _EGL_RESOURCE_SYNC, disp))
       sync = NULL;
    return sync;
 }
@@ -122,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 */