Mesa (staging/19.3): Revert "egl: avoid local modifications for eglext.h Khronos standard header file"

[GitLab Mirror]

Module: Mesa
Branch: staging/19.3
Commit: e0da0189072c54fa6e7098ea6dc3f6ce9431ad93
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e0da0189072c54fa6e7098ea6dc3f6ce9431ad93

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Thu Dec 12 09:23:54 2019 -0800

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.

---

 include/EGL/eglext.h         | 11 +++++++++++
 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