diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-05-18 17:47:35 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-05-18 17:47:35 +0000 |
| commit | 3b87fac327b5549678f91a9c961b9fe5c0bf8a37 (patch) | |
| tree | 93edbdb543dc53491e9ec42649db34b441d3ac64 | |
| parent | 72100ac7cff7485db3e869f1331caddb0bc21a24 (diff) | |
Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the
version number of the DRIInfoRec, disambiguating it from the XF86DRI
protocol version number. Modify DRIQueryVersion to return the libdri
version number, which all DDXes were requesting implicitly. Fix the
DDXes to check for the DRIINFO version they were compiled against.
| -rw-r--r-- | src/i810_dri.c | 7 | ||||
| -rw-r--r-- | src/i830_dri.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/i810_dri.c b/src/i810_dri.c index 8e49fd93..8cd4d1ea 100644 --- a/src/i810_dri.c +++ b/src/i810_dri.c @@ -319,11 +319,12 @@ I810DRIScreenInit(ScreenPtr pScreen) int major, minor, patch; DRIQueryVersion(&major, &minor, &patch); - if (major != 4 || minor < 0) { + if (major != DRIINFO_MAJOR_VERSION || minor < DRIINFO_MINOR_VERSION) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] I810DRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d bug version 4.0.x is needed.\n" - "[dri] Disabling DRI.\n", major, minor, patch); + "[dri] libdri version is %d.%d.%d bug version %d.%d.x is needed.\n" + "[dri] Disabling DRI.\n", major, minor, patch, + DRIINFO_MAJOR_VERSION, DRIINFO_MINOR_VERSION); return FALSE; } } diff --git a/src/i830_dri.c b/src/i830_dri.c index 01f02513..d836afc3 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -438,12 +438,13 @@ I830DRIScreenInit(ScreenPtr pScreen) int major, minor, patch; DRIQueryVersion(&major, &minor, &patch); - if (major != 4 || minor < 0) { + if (major != DRIINFO_MAJOR_VERSION || minor < DRIINFO_MINOR_VERSION) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] %s failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d bug version 4.0.x is needed.\n" + "[dri] libdri version is %d.%d.%d bug version %d.%d.x is needed.\n" "[dri] Disabling DRI.\n", - "I830DRIScreenInit", major, minor, patch); + "I830DRIScreenInit", major, minor, patch, + DRIINFO_MAJOR_VERSION, DRIINFO_MINOR_VERSION); return FALSE; } } |