diff options
| author | Emil Velikov <[email protected]> | 2016-02-10 12:21:31 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-03-09 17:16:51 +0000 |
| commit | f3e23ead536e66940053265216b3886fef69d891 (patch) | |
| tree | 351089edfab766c8d78f6424ae83bf4491e5e53b | |
| parent | 2295a4b1e124be0906907cf535efa022af5b8033 (diff) | |
egl: remove remnants of MESA_drm_display
Last set in st/egl, unused in mesa-demos and superseded by
EGL_KHR_platform_gbm.
Signed-off-by: Emil Velikov <[email protected]>
| -rw-r--r-- | include/EGL/eglmesaext.h | 11 | ||||
| -rw-r--r-- | src/egl/main/eglapi.c | 9 | ||||
| -rw-r--r-- | src/egl/main/egldisplay.h | 1 |
3 files changed, 0 insertions, 21 deletions
diff --git a/include/EGL/eglmesaext.h b/include/EGL/eglmesaext.h index 917a2043c77..337dd2cb789 100644 --- a/include/EGL/eglmesaext.h +++ b/include/EGL/eglmesaext.h @@ -34,17 +34,6 @@ extern "C" { #include <EGL/eglplatform.h> -#ifndef EGL_MESA_drm_display -#define EGL_MESA_drm_display 1 - -#ifdef EGL_EGLEXT_PROTOTYPES -EGLAPI EGLDisplay EGLAPIENTRY eglGetDRMDisplayMESA(int fd); -#endif /* EGL_EGLEXT_PROTOTYPES */ - -typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETDRMDISPLAYMESA) (int fd); - -#endif /* EGL_MESA_drm_display */ - #ifdef EGL_MESA_drm_image /* Mesa's extension to EGL_MESA_drm_image... */ #ifndef EGL_DRM_BUFFER_USE_CURSOR_MESA diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 031cf759c49..dd145a1195e 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -408,7 +408,6 @@ _eglCreateExtensionsString(_EGLDisplay *dpy) _EGL_CHECK_EXTENSION(KHR_wait_sync); _EGL_CHECK_EXTENSION(MESA_configless_context); - _EGL_CHECK_EXTENSION(MESA_drm_display); _EGL_CHECK_EXTENSION(MESA_drm_image); _EGL_CHECK_EXTENSION(MESA_image_dma_buf_export); @@ -1197,13 +1196,6 @@ eglGetError(void) } -static EGLDisplay EGLAPIENTRY -eglGetDRMDisplayMESA(int fd) -{ - _EGLDisplay *dpy = _eglFindDisplay(_EGL_PLATFORM_DRM, (void *) (intptr_t) fd); - return _eglGetDisplayHandle(dpy); -} - /** ** EGL 1.2 **/ @@ -1857,7 +1849,6 @@ eglGetProcAddress(const char *procname) { "eglGetPlatformDisplay", (_EGLProc) eglGetPlatformDisplay }, { "eglCreatePlatformWindowSurface", (_EGLProc) eglCreatePlatformWindowSurface }, { "eglCreatePlatformPixmapSurface", (_EGLProc) eglCreatePlatformPixmapSurface }, - { "eglGetDRMDisplayMESA", (_EGLProc) eglGetDRMDisplayMESA }, { "eglCreateImageKHR", (_EGLProc) eglCreateImageKHR }, { "eglDestroyImageKHR", (_EGLProc) eglDestroyImage }, { "eglCreateSyncKHR", (_EGLProc) eglCreateSyncKHR }, diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index bca9122ce6d..cec6d59e6a4 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -115,7 +115,6 @@ struct _egl_extensions EGLBoolean KHR_wait_sync; EGLBoolean MESA_configless_context; - EGLBoolean MESA_drm_display; EGLBoolean MESA_drm_image; EGLBoolean MESA_image_dma_buf_export; |