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 | 74b86b036def72e5180a46871b8452ba9eea9bb1 (patch) | |
| tree | 11828f0a4f95f5afb1462df62d3ef5584b68da3e | |
| parent | 0f4a8fc6aa5157a8b48beb49f30511665cfa4b63 (diff) | |
Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the versionXORG-6_8_99_8
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/atidri.c | 7 | ||||
| -rw-r--r-- | src/r128_dri.c | 7 | ||||
| -rw-r--r-- | src/radeon_dri.c | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/src/atidri.c b/src/atidri.c index c3fd9765..64e52a7a 100644 --- a/src/atidri.c +++ b/src/atidri.c @@ -1094,12 +1094,13 @@ Bool ATIDRIScreenInit( ScreenPtr pScreen ) /* Check the DRI version */ DRIQueryVersion( &major, &minor, &patch ); - if ( major != 4 || minor < 0 ) { + if ( major != DRIINFO_MAJOR_VERSION || minor < DRIINFO_MINOR_VERSION ) { xf86DrvMsg( pScreen->myNum, X_ERROR, "[dri] ATIDRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n" + "[dri] libdri version is %d.%d.%d but version %d.%d.x is needed.\n" "[dri] Disabling the DRI.\n", - major, minor, patch ); + major, minor, patch + DRIINFO_MAJOR_VERSION, DRIINFO_MINOR_VERSION ); return FALSE; } diff --git a/src/r128_dri.c b/src/r128_dri.c index 65bb5b94..f9d4be51 100644 --- a/src/r128_dri.c +++ b/src/r128_dri.c @@ -983,12 +983,13 @@ Bool R128DRIScreenInit(ScreenPtr pScreen) /* Check the DRI version */ DRIQueryVersion(&major, &minor, &patch); - if (major != 4 || minor < 0) { + if (major != DRIINFO_MAJOR_VERSION || minor < DRIINFO_MINOR_VERSION) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] R128DRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n" + "[dri] libdri version is %d.%d.%d but version %d.%d.x is needed.\n" "[dri] Disabling the DRI.\n", - major, minor, patch); + major, minor, patch, + DRIINFO_MAJOR_VERSION, DRIINFO_MINOR_VERSION); return FALSE; } diff --git a/src/radeon_dri.c b/src/radeon_dri.c index 88dda361..ef82bac0 100644 --- a/src/radeon_dri.c +++ b/src/radeon_dri.c @@ -1211,14 +1211,15 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) /* Check the DRI version */ DRIQueryVersion(&major, &minor, &patch); - if (major != 4 || minor < 0) { + if (major != DRIINFO_MAJOR_VERSION || minor < DRIINFO_MINOR_VERSION) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] RADEONDRIScreenInit failed because of a version " "mismatch.\n" - "[dri] libDRI version is %d.%d.%d but version 4.0.x is " + "[dri] libdri version is %d.%d.%d but version %d.%d.x is " "needed.\n" "[dri] Disabling DRI.\n", - major, minor, patch); + major, minor, patch, + DRIINFO_MAJOR_VERSION, DRIINFO_MINOR_VERSION); return FALSE; } |