egl: drop EGL driver `name`

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 <emil.l.velikov@gmail.com>
Related-to: b174a1ae720cb404738c ("egl: Simplify the "driver" interface")
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index e38459de0b138a764d7897f7f2a40edc305f1c1d..87e1a704c6e9d8b778f3e0458aa38477da00c3fd 100644 (file)
--- 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 590e43f00fb96b051fb4d610e4761280425fe058..0b56653395a94ac1f303e066f5124ff4068daacc 100644 (file)
--- 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 0227197284f2f0fca5aada854c2d20a682ca5738..57b4c77c41dd9f2da175d44ae6d9bd349380e154 100644 (file)
--- 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 3fe37f1641c8ef1699f2e21431dc84a5f2776336..b20652ed8c1d0182b5d5f17e96702f78b01c481e 100644 (file)
--- 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 ba12a060cab7f7c6c22311418fb0f3e6209c2b20..5695fc06ffb03102cc6434bcd12789baa34b1a52 100644 (file)
--- 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 */
 };