diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-12-12 09:23:54 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-12-12 09:23:54 -0800 |
| commit | e0da0189072c54fa6e7098ea6dc3f6ce9431ad93 (patch) | |
| tree | ebea8079376cff8bca604e5824bbecccb5e722a3 | |
| parent | ce856a73926650642eebd94086181c1d6723fdf6 (diff) | |
| download | mesa-e0da0189072c54fa6e7098ea6dc3f6ce9431ad93.tar.gz | |
Revert "egl: avoid local modifications for eglext.h Khronos standard header file"
This reverts commit 2a497735ec75cfc5edaff378613e3b145b3bb22d.
This patch is built on the previous patch, which needs to be reverted.
| -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 4e9c0dcf997..04facdfbce6 100644 --- a/include/EGL/eglext.h +++ b/include/EGL/eglext.h @@ -1362,6 +1362,17 @@ 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 69589436897..0cc097658cf 100644 --- a/include/EGL/eglextchromium.h +++ b/include/EGL/eglextchromium.h @@ -53,17 +53,6 @@ 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 |