summaryrefslogtreecommitdiff
path: root/glx
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2010-05-01 13:13:54 -0400
committerKristian Høgsberg <krh@bitplanet.net>2010-05-11 11:01:35 -0400
commit4a8a615d01b9ed18c272414bd11dc2fc661727e5 (patch)
tree10cca8732e0d51ce4ccea918334352f2798a35c3 /glx
parent6d7ba5e0fcb5d1bce6bb213dec009f3a0f802d26 (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>
Diffstat (limited to 'glx')
-rw-r--r--glx/glxdri2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 74d6ebc5d..c34e29a5a 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -653,7 +653,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
@@ -713,11 +713,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];
}
}