Mesa (master): egl: pull update from Khronos and drop local define

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 1346a36162a87c66a92f77306d251abb2a260fa2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1346a36162a87c66a92f77306d251abb2a260fa2

Author: Eric Engestrom <eric.engestrom at imgtec.com>
Date:   Fri Mar 16 15:33:04 2018 +0000

egl: pull update from Khronos and drop local define

Added in Khronos in 2b6bb4ee45cc46c89d4a "EGL_MESA_drm_image: add
EGL_DRM_BUFFER_USE_CURSOR_MESA to egl.xml" [1] as part of PR #36 [2].

[1] https://github.com/KhronosGroup/EGL-Registry/commit/2b6bb4ee45cc46c89d4a4349f2ca94e80d77cd97
[2] https://github.com/KhronosGroup/EGL-Registry/pull/36

Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 include/EGL/eglext.h     | 1 +
 include/EGL/eglmesaext.h | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h
index f7dc66884e..2f990cc54d 100644
--- a/include/EGL/eglext.h
+++ b/include/EGL/eglext.h
@@ -933,6 +933,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI (EGLDisplay dpy, EGLConfi
 #define EGL_DRM_BUFFER_STRIDE_MESA        0x31D4
 #define EGL_DRM_BUFFER_USE_SCANOUT_MESA   0x00000001
 #define EGL_DRM_BUFFER_USE_SHARE_MESA     0x00000002
+#define EGL_DRM_BUFFER_USE_CURSOR_MESA    0x00000004
 typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESAPROC) (EGLDisplay dpy, const EGLint *attrib_list);
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);
 #ifdef EGL_EGLEXT_PROTOTYPES
diff --git a/include/EGL/eglmesaext.h b/include/EGL/eglmesaext.h
index 5bf6306a38..f4332b279f 100644
--- a/include/EGL/eglmesaext.h
+++ b/include/EGL/eglmesaext.h
@@ -34,13 +34,6 @@ extern "C" {
 
 #include <EGL/eglplatform.h>
 
-#ifdef EGL_MESA_drm_image
-/* Mesa's extension to EGL_MESA_drm_image... */
-#ifndef EGL_DRM_BUFFER_USE_CURSOR_MESA
-#define EGL_DRM_BUFFER_USE_CURSOR_MESA		0x0004
-#endif
-#endif
-
 #ifndef EGL_WL_bind_wayland_display
 #define EGL_WL_bind_wayland_display 1