Revert "vmware/vmwgfx: Support multiple dri driver names"

This reverts commit d5550b7f83.

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>
This commit is contained in:
Thomas Hellstrom
2017-05-11 04:39:57 -07:00
parent 3aff4ee5ca
commit c8b8b2ee4a

View File

@@ -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