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.
Cc: Kai Wasserbäch <k...@dev.carbon-project.org>
Suggested-by: Emil Velikov <emil.l.veli...@gmail.com>
Related-to: b174a1ae720cb404738c ("egl: Simplify the "driver" interface")
Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com>
---
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 7c63920c54624e0e674e..3dce5f82320b2465037a 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -3269,6 +3269,4 @@ _eglInitDriver(_EGLDriver *dri2_drv)
dri2_drv->API.GLInteropQueryDeviceInfo = dri2_interop_query_device_info;
dri2_drv->API.GLInteropExportObject = dri2_interop_export_object;
dri2_drv->API.DupNativeFenceFDANDROID = dri2_dup_native_fence_fd;
-
- dri2_drv->Name = "DRI2";
}
diff --git a/src/egl/drivers/haiku/egl_haiku.cpp
b/src/egl/drivers/haiku/egl_haiku.cpp
index 590e43f00fb96b051fb4..0b56653395a94ac1f303 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 c1bf5bbfe19b3172429e..306db209cd94748f048f 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -619,8 +619,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 71bfca21ed8c6a666c14..f1973bde274ec768c4cf 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 ba12a060cab7f7c6c223..5695fc06ffb03102cc64 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 */
};
--
Cheers,
Eric
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
