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>
This commit is contained in:
parent
6d7ba5e0fc
commit
4a8a615d01
|
@ -653,7 +653,7 @@ initializeExtensions(__GLXDRIscreen *screen)
|
||||||
|
|
||||||
#ifdef __DRI2_FLUSH
|
#ifdef __DRI2_FLUSH
|
||||||
if (strcmp(extensions[i]->name, __DRI2_FLUSH) == 0 &&
|
if (strcmp(extensions[i]->name, __DRI2_FLUSH) == 0 &&
|
||||||
extensions[i]->version >= __DRI2_FLUSH_VERSION) {
|
extensions[i]->version >= 3) {
|
||||||
screen->flush = (__DRI2flushExtension *) extensions[i];
|
screen->flush = (__DRI2flushExtension *) extensions[i];
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -713,11 +713,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
||||||
|
|
||||||
for (i = 0; extensions[i]; i++) {
|
for (i = 0; extensions[i]; i++) {
|
||||||
if (strcmp(extensions[i]->name, __DRI_CORE) == 0 &&
|
if (strcmp(extensions[i]->name, __DRI_CORE) == 0 &&
|
||||||
extensions[i]->version >= __DRI_CORE_VERSION) {
|
extensions[i]->version >= 1) {
|
||||||
screen->core = (const __DRIcoreExtension *) extensions[i];
|
screen->core = (const __DRIcoreExtension *) extensions[i];
|
||||||
}
|
}
|
||||||
if (strcmp(extensions[i]->name, __DRI_DRI2) == 0 &&
|
if (strcmp(extensions[i]->name, __DRI_DRI2) == 0 &&
|
||||||
extensions[i]->version >= __DRI_DRI2_VERSION) {
|
extensions[i]->version >= 1) {
|
||||||
screen->dri2 = (const __DRIdri2Extension *) extensions[i];
|
screen->dri2 = (const __DRIdri2Extension *) extensions[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user