From 57acf921e28eebb76e22f9abb96008885ec44441 Mon Sep 17 00:00:00 2001 From: Laurent Carlier Date: Wed, 6 Nov 2019 16:04:50 +0100 Subject: [PATCH] egl: avoid local modifications for eglext.h Khronos standard header file MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Marek Olšák --- 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 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 -- 2.30.2