From: Eric Engestrom Date: Fri, 16 Mar 2018 15:33:04 +0000 (+0000) Subject: egl: pull update from Khronos and drop local define X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1346a36162a87c66a92f77306d251abb2a260fa2;p=mesa.git 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 Reviewed-by: Emil Velikov --- diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h index f7dc66884ee..2f990cc54d6 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 5bf6306a38e..f4332b279f8 100644 --- a/include/EGL/eglmesaext.h +++ b/include/EGL/eglmesaext.h @@ -34,13 +34,6 @@ extern "C" { #include -#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