diff options
| author | Chad Versace <[email protected]> | 2016-09-27 13:27:21 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2016-10-10 09:54:11 -0700 |
| commit | 804488518296fbf20b06244bc0aa2e2793c61998 (patch) | |
| tree | 5759f57e308fd03a37a6a96f143eb69b01776052 /src/egl/main/eglapi.h | |
| parent | 0f99c0686e9f14238125b3b7b492d35eb2f4c023 (diff) | |
egl: Unify the EGLint/EGLAttrib paths in eglCreateSync* (v3)
Pre-patch, there were two code paths for parsing EGLSync attribute
lists: one path for old-style EGLint lists, used by eglCreateSyncKHR,
and another for new-style EGLAttrib lists, used by eglCreateSync (1.5)
and eglCreateSync64 (EGL_KHR_cl_event2).
There were two attrib_list parsing functions,
_eglParseSyncAttribList(_EGLSync *sync, const EGLint *attrib_list)
_eglParseSyncAttribList64(_EGLSync *sync, const EGLattrib *attrib_list)
This patch unifies the two attrib_list parsing functions into one,
_eglParseSyncAttribList(_EGLSync *sync, const EGLattrib *attrib_list)
Many internal EGLSync function signatures had *two* attrib_list
parameters to accomodate both code paths: one parameter was an EGLint
list and other an EGLAttrib list. At most one of the parameters was
allowed to be non-null. This patch removes the `EGLint *attrib_list`
parameter, leaving only the `EGLAttrib *attrib_list` parameter, for all
internal EGLSync functions.
v2:
- Consistently use condition (sizeof(int_list[0]) ==
sizeof(attrib_list[0])). [for emil]
v3:
- Don't double-unlock the display in eglCreateSyncKHR.
Reviewed-by: Emil Velikov <[email protected]> (v2)
Diffstat (limited to 'src/egl/main/eglapi.h')
| -rw-r--r-- | src/egl/main/eglapi.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h index 5d9c1b85edc..b9bcc8ec8c7 100644 --- a/src/egl/main/eglapi.h +++ b/src/egl/main/eglapi.h @@ -135,8 +135,7 @@ struct _egl_api _EGLImage *image); _EGLSync *(*CreateSyncKHR)(_EGLDriver *drv, _EGLDisplay *dpy, EGLenum type, - const EGLint *attrib_list, - const EGLAttrib *attrib_list64); + const EGLAttrib *attrib_list); EGLBoolean (*DestroySyncKHR)(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync); EGLint (*ClientWaitSyncKHR)(_EGLDriver *drv, _EGLDisplay *dpy, |