projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
egl: remove final pieces of KHR_vg_parent_image
[mesa.git]
/
src
/
egl
/
main
/
eglsync.h
diff --git
a/src/egl/main/eglsync.h
b/src/egl/main/eglsync.h
index 1a56889642e236ba6699af7566505a28c8c70338..9b2aac8828b90a3f65b6215e5ffcff0843973556 100644
(file)
--- a/
src/egl/main/eglsync.h
+++ b/
src/egl/main/eglsync.h
@@
-30,13
+30,12
@@
#define EGLSYNC_INCLUDED
#define EGLSYNC_INCLUDED
+#include "c99_compat.h"
+
#include "egltypedefs.h"
#include "egldisplay.h"
#include "egltypedefs.h"
#include "egldisplay.h"
-#ifdef EGL_KHR_reusable_sync
-
-
/**
* "Base" class for device driver syncs.
*/
/**
* "Base" class for device driver syncs.
*/
@@
-48,23
+47,24
@@
struct _egl_sync
EGLenum Type;
EGLenum SyncStatus;
EGLenum SyncCondition;
EGLenum Type;
EGLenum SyncStatus;
EGLenum SyncCondition;
+ EGLAttrib CLEvent;
};
};
-
PUBLIC
EGLBoolean
+
extern
EGLBoolean
_eglInitSync(_EGLSync *sync, _EGLDisplay *dpy, EGLenum type,
_eglInitSync(_EGLSync *sync, _EGLDisplay *dpy, EGLenum type,
- const EGLint *attrib_list);
+ const EGLint *attrib_list
, const EGLAttrib *attrib_list64
);
extern EGLBoolean
extern EGLBoolean
-_eglGetSyncAttrib
KHR
(_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.
*/
/**
* Increment reference count for the sync.
*/
-static
INLINE
_EGLSync *
+static
inline
_EGLSync *
_eglGetSync(_EGLSync *sync)
{
if (sync)
_eglGetSync(_EGLSync *sync)
{
if (sync)
@@
-76,7
+76,7
@@
_eglGetSync(_EGLSync *sync)
/**
* Decrement reference count for the sync.
*/
/**
* Decrement reference count for the sync.
*/
-static
INLINE
EGLBoolean
+static
inline
EGLBoolean
_eglPutSync(_EGLSync *sync)
{
return (sync) ? _eglPutResource(&sync->Resource) : EGL_FALSE;
_eglPutSync(_EGLSync *sync)
{
return (sync) ? _eglPutResource(&sync->Resource) : EGL_FALSE;
@@
-87,18
+87,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.
*/
* 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);
_eglLinkSync(_EGLSync *sync)
{
_eglLinkResource(&sync->Resource, _EGL_RESOURCE_SYNC);
- return (EGLSync
KHR
) sync;
+ return (EGLSync) sync;
}
/**
* Unlink a linked sync from its display.
*/
}
/**
* Unlink a linked sync from its display.
*/
-static
INLINE
void
+static
inline
void
_eglUnlinkSync(_EGLSync *sync)
{
_eglUnlinkResource(&sync->Resource, _EGL_RESOURCE_SYNC);
_eglUnlinkSync(_EGLSync *sync)
{
_eglUnlinkResource(&sync->Resource, _EGL_RESOURCE_SYNC);
@@
-109,8
+109,8
@@
_eglUnlinkSync(_EGLSync *sync)
* Lookup a handle to find the linked sync.
* Return NULL if the handle has no corresponding linked sync.
*/
* Lookup a handle to find the linked sync.
* Return NULL if the handle has no corresponding linked sync.
*/
-static
INLINE
_EGLSync *
-_eglLookupSync(EGLSync
KHR
handle, _EGLDisplay *dpy)
+static
inline
_EGLSync *
+_eglLookupSync(EGLSync handle, _EGLDisplay *dpy)
{
_EGLSync *sync = (_EGLSync *) handle;
if (!dpy || !_eglCheckResource((void *) sync, _EGL_RESOURCE_SYNC, dpy))
{
_EGLSync *sync = (_EGLSync *) handle;
if (!dpy || !_eglCheckResource((void *) sync, _EGL_RESOURCE_SYNC, dpy))
@@
-122,16
+122,13
@@
_eglLookupSync(EGLSyncKHR handle, _EGLDisplay *dpy)
/**
* Return the handle of a linked sync, or EGL_NO_SYNC_KHR.
*/
/**
* 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)) ?
_eglGetSyncHandle(_EGLSync *sync)
{
_EGLResource *res = (_EGLResource *) sync;
return (res && _eglIsResourceLinked(res)) ?
- (EGLSync
KHR
) sync : EGL_NO_SYNC_KHR;
+ (EGLSync) sync : EGL_NO_SYNC_KHR;
}
}
-#endif /* EGL_KHR_reusable_sync */
-
-
#endif /* EGLSYNC_INCLUDED */
#endif /* EGLSYNC_INCLUDED */