diff options
| author | Laurent Carlier <lordheavym@gmail.com> | 2019-11-06 16:04:50 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@intel.com> | 2019-11-11 17:20:16 +0000 |
| commit | 57acf921e28eebb76e22f9abb96008885ec44441 (patch) | |
| tree | 8f09b59e1dea21101135e1bb1c03af538210dca9 /include | |
| parent | eaf43966027cf9654e91ca57aecc8f5a65b58f49 (diff) | |
egl: avoid local modifications for eglext.h Khronos standard header file
Move differences in eglextchromium.h header file, then provide the same header than libglvnd-1.2
So program that omit to include eglextchromium.h will fail to build with both mesa and libglvnd headers.
Fixes: a0a8109f "include: add the definition of EGL_EXT_image_flush_external"
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/EGL/eglext.h | 11 | ||||
| -rw-r--r-- | include/EGL/eglextchromium.h | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h index 04facdfbce6..4e9c0dcf997 100644 --- a/include/EGL/eglext.h +++ b/include/EGL/eglext.h @@ -1362,17 +1362,6 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void); #define EGL_NATIVE_SURFACE_TIZEN 0x32A1 #endif /* EGL_TIZEN_image_native_surface */ -#ifndef EGL_EXT_image_flush_external -#define EGL_EXT_image_flush_external 1 -#define EGL_IMAGE_EXTERNAL_FLUSH_EXT 0x32A2 -typedef EGLBoolean (EGLAPIENTRYP PFNEGLIMAGEFLUSHEXTERNALEXTPROC) (EGLDisplay dpy, EGLImageKHR image, const EGLAttrib *attrib_list); -typedef EGLBoolean (EGLAPIENTRYP PFNEGLIMAGEINVALIDATEEXTERNALEXTPROC) (EGLDisplay dpy, EGLImageKHR image, const EGLAttrib *attrib_list); -#ifdef EGL_EGLEXT_PROTOTYPES -EGLAPI EGLBoolean EGLAPIENTRY eglImageFlushExternalEXT (EGLDisplay dpy, EGLImageKHR image, const EGLAttrib *attrib_list); -EGLAPI EGLBoolean EGLAPIENTRY eglImageInvalidateExternalEXT (EGLDisplay dpy, EGLImageKHR image, const EGLAttrib *attrib_list); -#endif -#endif /* EGL_EXT_image_flush_external */ - #ifdef __cplusplus } #endif diff --git a/include/EGL/eglextchromium.h b/include/EGL/eglextchromium.h index 0cc097658cf..69589436897 100644 --- a/include/EGL/eglextchromium.h +++ b/include/EGL/eglextchromium.h @@ -53,6 +53,17 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCVALUESCHROMIUMPROC) #endif #endif +#ifndef EGL_EXT_image_flush_external +#define EGL_EXT_image_flush_external 1 +#define EGL_IMAGE_EXTERNAL_FLUSH_EXT 0x32A2 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLIMAGEFLUSHEXTERNALEXTPROC) (EGLDisplay dpy, EGLImageKHR image, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLIMAGEINVALIDATEEXTERNALEXTPROC) (EGLDisplay dpy, EGLImageKHR image, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglImageFlushExternalEXT (EGLDisplay dpy, EGLImageKHR image, const EGLAttrib *attrib_list); +EGLAPI EGLBoolean EGLAPIENTRY eglImageInvalidateExternalEXT (EGLDisplay dpy, EGLImageKHR image, const EGLAttrib *attrib_list); +#endif +#endif /* EGL_EXT_image_flush_external */ + #ifdef __cplusplus } #endif |