egl: move #include of local headers out of Khronos headers

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h
index 02dd77191611cea82f16df788768d71e02d6b22b..04facdfbce6f864149d78bc32e001877db975abd 100644 (file)
--- a/include/EGL/eglext.h
+++ b/include/EGL/eglext.h
@@ -1373,9 +1373,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglImageInvalidateExternalEXT (EGLDisplay dpy, EGL
 #endif
 #endif /* EGL_EXT_image_flush_external */
 
 #endif
 #endif /* EGL_EXT_image_flush_external */
 

-#include <EGL/eglmesaext.h>
-#include <EGL/eglextchromium.h>
-

 #ifdef __cplusplus
 }
 #endif
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/egl/generate/gen_egl_dispatch.py b/src/egl/generate/gen_egl_dispatch.py
index 12342b28a541aca62d12f269da56482c92e6f827..2063e9d09930f3c2e17a1b0aaf59b66d4e3364ef 100644 (file)
--- a/src/egl/generate/gen_egl_dispatch.py
+++ b/src/egl/generate/gen_egl_dispatch.py
@@ -100,6 +100,8 @@ def generateHeader(functions):
 
     #include <EGL/egl.h>
     #include <EGL/eglext.h>
 
     #include <EGL/egl.h>
     #include <EGL/eglext.h>

+    #include <EGL/eglmesaext.h>
+    #include <EGL/eglextchromium.h>

     #include "glvnd/libeglabi.h"
 
     """.lstrip("\n"))
     #include "glvnd/libeglabi.h"
 
     """.lstrip("\n"))

diff --git a/src/egl/main/egltypedefs.h b/src/egl/main/egltypedefs.h
index 642f473c4eb411ff1beba516bd2d59fb748e988a..4809cf5d7d5a5dab962dc4b3ed510d5320b02e15 100644 (file)
--- a/src/egl/main/egltypedefs.h
+++ b/src/egl/main/egltypedefs.h
@@ -33,6 +33,8 @@
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>

+#include <EGL/eglmesaext.h>
+#include <EGL/eglextchromium.h>

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {