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 | f4b3779cafdbcfeaddf6f55c4b2c67a667ab5d14 (patch) | |
| tree | d7b7c7156d3221a5429f7877fe0f15eecc010865 | |
| parent | 1b6392ffb792212016e710aaf27ffe36e5703d36 (diff) | |
Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the versionXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_10
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/mga_dri.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mga_dri.c b/src/mga_dri.c index 098b24b..1506a7f 100644 --- a/src/mga_dri.c +++ b/src/mga_dri.c @@ -1012,12 +1012,13 @@ Bool MGADRIScreenInit( 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] MGADRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version = %d.%d.%d but version 4.0.x is needed.\n" + "[dri] libdri version = %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; } } |