Mesa (staging/19.3): egl: move #include of local headers out of Khronos headers
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Nov 13 18:33:33 UTC 2019
Module: Mesa
Branch: staging/19.3
Commit: 780e014de0025c18868ffbd52c7a22548af14a7a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=780e014de0025c18868ffbd52c7a22548af14a7a
Author: Eric Engestrom <eric.engestrom at intel.com>
Date: Wed Nov 6 19:53:28 2019 +0000
egl: move #include of local headers out of Khronos headers
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit eaf43966027cf9654e91ca57aecc8f5a65b58f49)
---
include/EGL/eglext.h | 3 ---
src/egl/generate/gen_egl_dispatch.py | 2 ++
src/egl/main/egltypedefs.h | 2 ++
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h
index 02dd7719161..04facdfbce6 100644
--- 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 */
-#include <EGL/eglmesaext.h>
-#include <EGL/eglextchromium.h>
-
#ifdef __cplusplus
}
#endif
diff --git a/src/egl/generate/gen_egl_dispatch.py b/src/egl/generate/gen_egl_dispatch.py
index 12342b28a54..2063e9d0993 100644
--- 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/eglmesaext.h>
+ #include <EGL/eglextchromium.h>
#include "glvnd/libeglabi.h"
""".lstrip("\n"))
diff --git a/src/egl/main/egltypedefs.h b/src/egl/main/egltypedefs.h
index 642f473c4eb..4809cf5d7d5 100644
--- 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/eglmesaext.h>
+#include <EGL/eglextchromium.h>
#ifdef __cplusplus
extern "C" {
More information about the mesa-commit
mailing list