glx: Fix incorrect use of dri_interface.h version defines in driver probing.

If we extend __DRI_CORE or __DRI_SWRAST in dri_interface.h to allow a
new version, it shouldn't make old server code retroactively require
the new version from swrast drivers.

Notably, new Mesa defines __DRI_SWRAST version 4, but we still want to
be able to probe version 1 drivers, since we don't use any features
beyond version 1 of the struct.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Eric Anholt 2013-11-14 17:40:47 -08:00 committed by Keith Packard
parent 6e926b18ca
commit ac772cb187

View File

@ -443,9 +443,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->driver = glxProbeDriver(driverName,
(void **) &screen->core,
__DRI_CORE, __DRI_CORE_VERSION,
__DRI_CORE, 1,
(void **) &screen->swrast,
__DRI_SWRAST, __DRI_SWRAST_VERSION);
__DRI_SWRAST, 1);
if (screen->driver == NULL) {
goto handle_error;
}