diff options
| author | Eric Anholt <eric@anholt.net> | 2013-11-14 17:40:47 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-12-05 10:51:01 -0800 |
| commit | ac772cb187ddf7e04b8f4b3a071b90f18f4488d0 (patch) | |
| tree | 58ff10f1fbcf8e75d14739740ec512cc885ae7b0 | |
| parent | 6e926b18ca1b182253bac435a1d53caaff7ffff6 (diff) | |
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>
| -rw-r--r-- | glx/glxdriswrast.c | 4 |
1 files 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; } |