fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 02:38:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "egl: drop EGL driver name"

Browse source 
This reverts commit 6414d6bd8d.

This is needed to apply the next revert.
This commit is contained in:
Marek Olšák 2017-10-18 20:22:58 +02:00
parent f37af5ec8d
commit 2cb9ab53dd
5 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/egl/drivers/dri2/egl_dri2.c
View file

@ -3244,4 +3244,6 @@ _eglInitDriver(_EGLDriver *dri2_drv)
dri2_drv->API.GLInteropQueryDeviceInfo = dri2_interop_query_device_info; dri2_drv->API.GLInteropQueryDeviceInfo = dri2_interop_query_device_info;
dri2_drv->API.GLInteropExportObject = dri2_interop_export_object; dri2_drv->API.GLInteropExportObject = dri2_interop_export_object;
dri2_drv->API.DupNativeFenceFDANDROID = dri2_dup_native_fence_fd; dri2_drv->API.DupNativeFenceFDANDROID = dri2_dup_native_fence_fd;
dri2_drv->Name = "DRI2";
} }

2
src/egl/drivers/haiku/egl_haiku.cpp
View file

@ -325,5 +325,7 @@ _eglInitDriver(_EGLDriver *driver)
driver->API.SwapBuffers = haiku_swap_buffers; driver->API.SwapBuffers = haiku_swap_buffers;
driver->Name = "Haiku";
TRACE("API Calls defined\n"); TRACE("API Calls defined\n");
} }

3
src/egl/main/eglapi.c
View file

@ -615,7 +615,8 @@ eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
_eglCreateExtensionsString(disp); _eglCreateExtensionsString(disp);
_eglCreateAPIsString(disp); _eglCreateAPIsString(disp);
snprintf(disp->VersionString, sizeof(disp->VersionString), snprintf(disp->VersionString, sizeof(disp->VersionString),
"%d.%d", disp->Version / 10, disp->Version % 10); "%d.%d (%s)", disp->Version / 10, disp->Version % 10,
disp->Driver->Name);
} }
/* Update applications version of major and minor if not NULL */ /* Update applications version of major and minor if not NULL */

2
src/egl/main/egldriver.c
View file

@ -98,6 +98,8 @@ _eglMatchDriver(_EGLDisplay *dpy)
} }
if (best_drv) { if (best_drv) {
_eglLog(_EGL_DEBUG, "the best driver is %s",
best_drv->Name);
dpy->Driver = best_drv; dpy->Driver = best_drv;
dpy->Initialized = EGL_TRUE; dpy->Initialized = EGL_TRUE;
} }

2
src/egl/main/egldriver.h
View file

@ -75,6 +75,8 @@ extern "C" {
*/ */
struct _egl_driver struct _egl_driver
{ {
const char *Name; /**< name of this driver */
_EGLAPI API; /**< EGL API dispatch table */ _EGLAPI API; /**< EGL API dispatch table */
}; };