diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2017-05-11 04:39:57 -0700 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2017-05-11 07:34:19 -0700 |
| commit | ea94dc570846655bbb8a7c75bf465907e454bef9 (patch) | |
| tree | 88afd3f0a1d1e0c57546f4d33d0c2fa663d3968b | |
| parent | ed9d2a3fde597f2ff397fc11640c7001b816f3a6 (diff) | |
Revert "vmware/vmwgfx: Support multiple dri driver names"
This reverts commit d5550b7f8375c3d9003731578c1570e014577348.
The commit was intended to support video drivers, but has the side effect
that GLX thinks our driver supports more than it does.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
| -rw-r--r-- | vmwgfx/vmwgfx_dri2.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c index 621012a..bb66aef 100644 --- a/vmwgfx/vmwgfx_dri2.c +++ b/vmwgfx/vmwgfx_dri2.c @@ -415,9 +415,6 @@ xorg_dri2_init(ScreenPtr pScreen) int major, minor; char fdPath[VMWGFX_FD_PATH_LEN]; ssize_t numChar; - static const char driverName[] = "vmwgfx"; - static const char *const driverNames[] = { - driverName, driverName}; memset(&dri2info, 0, sizeof(dri2info)); @@ -429,11 +426,9 @@ xorg_dri2_init(ScreenPtr pScreen) minor = 0; } - dri2info.version = min(DRI2INFOREC_VERSION, 4); + dri2info.version = min(DRI2INFOREC_VERSION, 3); dri2info.fd = ms->fd; - dri2info.driverName = NULL; - dri2info.numDrivers = 2; - dri2info.driverNames = driverNames; + dri2info.driverName = "vmwgfx"; /* * This way of obtaining the DRM device name is a bit |