[Mesa-dev] [PATCH mesa 2/2] egl: drop EGL driver `name`

[Eric Engestrom]

Ugh, apologies, I failed at git again...  I just pushed these two (and
the UseFallback patch) to master by mistake...

I'm happy to revert if someone had and reservation on this patch

/me doesn't push anything anywhere anymore today.


On Wednesday, 2017-10-18 15:42:34 +0000, Eric Engestrom wrote:
> 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 <kai at dev.carbon-project.org>
> Suggested-by: Emil Velikov <emil.l.velikov at gmail.com>
> Related-to: b174a1ae720cb404738c ("egl: Simplify the "driver" interface")
> Signed-off-by: Eric Engestrom <eric.engestrom at 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 0750dc1946988ed064de..f9fc71e51bf0a63daadb 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -3244,6 +3244,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 38fc9311cb8da3ed5f6f..36d69688146b6d913946 100644
> --- a/src/egl/main/eglapi.c
> +++ b/src/egl/main/eglapi.c
> @@ -615,8 +615,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 003f74ed63d577fd2d0b..33f8f57aeb11e06f92f2 100644
> --- a/src/egl/main/egldriver.c
> +++ b/src/egl/main/egldriver.c
> @@ -95,8 +95,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
>