From a857bc66dc66cc69d2a4366af4a0f5119a43e275 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Thu, 12 Dec 2019 09:24:42 -0800
Subject: Revert "egl: move #include of local headers out of Khronos headers"

This reverts commit 87efb9f3a4f366372bc873dee741a2c2f272e5c9.

This is breaking the QT build, so it needs to go until these symbols can
make their way to upstream khronos
---
 include/EGL/eglext.h                 | 3 +++
 src/egl/generate/gen_egl_dispatch.py | 2 --
 src/egl/main/egltypedefs.h           | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h
index 04facdfbce6..02dd7719161 100644
--- a/include/EGL/eglext.h
+++ b/include/EGL/eglext.h
@@ -1373,6 +1373,9 @@ 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 2063e9d0993..12342b28a54 100644
--- a/src/egl/generate/gen_egl_dispatch.py
+++ b/src/egl/generate/gen_egl_dispatch.py
@@ -100,8 +100,6 @@ 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 4809cf5d7d5..642f473c4eb 100644
--- a/src/egl/main/egltypedefs.h
+++ b/src/egl/main/egltypedefs.h
@@ -33,8 +33,6 @@
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
-#include <EGL/eglmesaext.h>
-#include <EGL/eglextchromium.h>
 
 #ifdef __cplusplus
 extern "C" {
-- 
cgit v1.2.3