diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-05-01 13:13:54 -0400 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-06-02 10:43:04 +1000 |
| commit | 44521bb9d03a0b7af10f89c98e51bd4109fec327 (patch) | |
| tree | 7ce66a86bcc1a6c18b86c346e0996f2347285d45 | |
| parent | a847cc9bce744cab72637d62bc6bd45237bd3de5 (diff) | |
glxdri2: Hard-code the extension version we need
If we use the #define'd version from dri_interface.h, the server will
require at least that version of the extension. If we're compiling against
a dri_interface.h with a newer version we don't really require, glxdri2
will require a too high version of the extension.
The right approach is to just hard-code the version we need instead of
using the #defines.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit 4a8a615d01b9ed18c272414bd11dc2fc661727e5)
| -rw-r--r-- | glx/glxdri2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glx/glxdri2.c b/glx/glxdri2.c index e791bf6bf..e84c28b34 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -658,7 +658,7 @@ initializeExtensions(__GLXDRIscreen *screen) #ifdef __DRI2_FLUSH if (strcmp(extensions[i]->name, __DRI2_FLUSH) == 0 && - extensions[i]->version >= __DRI2_FLUSH_VERSION) { + extensions[i]->version >= 3) { screen->flush = (__DRI2flushExtension *) extensions[i]; } #endif @@ -718,11 +718,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen) for (i = 0; extensions[i]; i++) { if (strcmp(extensions[i]->name, __DRI_CORE) == 0 && - extensions[i]->version >= __DRI_CORE_VERSION) { + extensions[i]->version >= 1) { screen->core = (const __DRIcoreExtension *) extensions[i]; } if (strcmp(extensions[i]->name, __DRI_DRI2) == 0 && - extensions[i]->version >= __DRI_DRI2_VERSION) { + extensions[i]->version >= 1) { screen->dri2 = (const __DRIdri2Extension *) extensions[i]; } } |