From ac772cb187ddf7e04b8f4b3a071b90f18f4488d0 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 14 Nov 2013 17:40:47 -0800 Subject: [PATCH] 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 Reviewed-by: Ian Romanick --- glx/glxdriswrast.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c index aa083e053..2d5efa03f 100644 --- a/glx/glxdriswrast.c +++ b/glx/glxdriswrast.c @@ -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; }