From a96749b13ca9446155964ddd32379251b822f6f8 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 18 Oct 2017 16:32:33 +0100 Subject: egl: drop EGL driver `name` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a revert of Marek's 2cb9ab53dd3ae6850a26 revert. It was needed to revert the previous commit, and didn't have any issue itself. -- The "DRI2" name was reported as confusing when printing EGL infos (one user reported thinking DRI3 was not working on his X server), and the only alternative is Haiku, which can only be used on a Haiku machine. The name therefore doesn't add any information that the user wouldn't know already, so let's just drop it. Suggested-by: Emil Velikov Related-to: b174a1ae720cb404738c ("egl: Simplify the "driver" interface") Signed-off-by: Eric Engestrom Reviewed-by: Kai Wasserbäch Reviewed-by: Emil Velikov --- src/egl/main/eglapi.c | 3 +-- src/egl/main/egldriver.c | 2 -- src/egl/main/egldriver.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) (limited to 'src/egl/main') diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 0227197284f..57b4c77c41d 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -634,8 +634,7 @@ eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor) _eglCreateExtensionsString(disp); _eglCreateAPIsString(disp); snprintf(disp->VersionString, sizeof(disp->VersionString), - "%d.%d (%s)", disp->Version / 10, disp->Version % 10, - disp->Driver->Name); + "%d.%d", disp->Version / 10, disp->Version % 10); } /* Update applications version of major and minor if not NULL */ diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c index 3fe37f1641c..b20652ed8c1 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -99,8 +99,6 @@ _eglMatchDriver(_EGLDisplay *dpy) } if (best_drv) { - _eglLog(_EGL_DEBUG, "the best driver is %s", - best_drv->Name); dpy->Driver = best_drv; dpy->Initialized = EGL_TRUE; } diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index ba12a060cab..5695fc06ffb 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -75,8 +75,6 @@ extern "C" { */ struct _egl_driver { - const char *Name; /**< name of this driver */ - _EGLAPI API; /**< EGL API dispatch table */ }; -- cgit v1.2.3