Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the versionXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_12XORG-6_8_99_11XORG-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.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/sis_dri.c b/src/sis_dri.c
index 124a88e..43c15f3 100644
--- a/src/sis_dri.c
+++ b/src/sis_dri.c
@@ -271,12 +271,13 @@ SISDRIScreenInit(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] SISDRIScreenInit failed because of a version mismatch.\n"
-                    "\t[dri] libDRI version is %d.%d.%d but version 4.0.x is needed.\n"
+                    "\t[dri] libdri version is %d.%d.%d but version %d.%d.x is needed.\n"
                     "\t[dri] Disabling DRI.\n",
-                    major, minor, patch);
+                    major, minor, patch,
+                    DRIINFO_MAJOR_VERSION, DRIINFO_MINOR_VERSION);
         return FALSE;
      }
   }