diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-05-18 17:47:36 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-05-18 17:47:36 +0000 |
| commit | 3d8be0cf1ccbbe4e68c5fae92203a152901b2436 (patch) | |
| tree | c6e09e49c6cb52423a73034d68a5eb3ddc8bad37 /src/savage_dri.c | |
| parent | a42d68da8d3905bc21d426b68519ba0d8356ed7b (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.
Diffstat (limited to 'src/savage_dri.c')
| -rw-r--r-- | src/savage_dri.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/savage_dri.c b/src/savage_dri.c index aebcf2a..dc07602 100644 --- a/src/savage_dri.c +++ b/src/savage_dri.c @@ -834,12 +834,13 @@ Bool SAVAGEDRIScreenInit( 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] SAVAGEDRIScreenInit 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; } } |