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 | 6c9a3742c576454eb7f56433c3196968bc73a991 (patch) | |
| tree | 121ed375a8963e3f7bc7a665718901a32028072a | |
| parent | 74b13899c20fcbe5030fbf6891e3931a2de9b50f (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/ffb_dri.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ffb_dri.c b/src/ffb_dri.c index d6230e3..93ed1a4 100644 --- a/src/ffb_dri.c +++ b/src/ffb_dri.c @@ -219,12 +219,13 @@ FFBDRIScreenInit(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] FFBDRIScreenInit 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 DRI.\n", - major, minor, patch); + major, minor, patch, + DRIINFO_MAJOR_VERSION, DRIINFO_MINOR_VERSION); return FALSE; } } |