From a96749b13ca9446155964ddd32379251b822f6f8 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 18 Oct 2017 16:32:33 +0100 Subject: [PATCH] egl: drop EGL driver `name` MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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/drivers/dri2/egl_dri2.c | 2 -- src/egl/drivers/haiku/egl_haiku.cpp | 2 -- src/egl/main/eglapi.c | 3 +-- src/egl/main/egldriver.c | 2 -- src/egl/main/egldriver.h | 2 -- 5 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index e38459de0b1..87e1a704c6e 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -3309,6 +3309,4 @@ _eglInitDriver(_EGLDriver *dri2_drv) dri2_drv->API.GLInteropExportObject = dri2_interop_export_object; dri2_drv->API.DupNativeFenceFDANDROID = dri2_dup_native_fence_fd; dri2_drv->API.SetBlobCacheFuncsANDROID = dri2_set_blob_cache_funcs; - - dri2_drv->Name = "DRI2"; } diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp index 590e43f00fb..0b56653395a 100644 --- a/src/egl/drivers/haiku/egl_haiku.cpp +++ b/src/egl/drivers/haiku/egl_haiku.cpp @@ -325,7 +325,5 @@ _eglInitDriver(_EGLDriver *driver) driver->API.SwapBuffers = haiku_swap_buffers; - driver->Name = "Haiku"; - TRACE("API Calls defined\n"); } 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 */ }; -- 2.30.2