OSDN Git Service

if DDX is -1 don't do DDX check
authorDave Airlie <airliedfreedesktop.org>
Mon, 3 Apr 2006 07:41:14 +0000 (07:41 +0000)
committerDave Airlie <airliedfreedesktop.org>
Mon, 3 Apr 2006 07:41:14 +0000 (07:41 +0000)
src/mesa/drivers/dri/common/utils.c

index 7703cb6..e3eca86 100644 (file)
@@ -376,9 +376,10 @@ driCheckDriDdxDrmVersions3(const char * driver_name,
    }
 
    /* Check that the DDX driver version is compatible */
-   if ( (ddxActual->major < ddxExpected->major_min)
+   /* for miniglx we pass in -1 so we can ignore the DDX version */
+   if ( (ddxActual->major != -1) && ((ddxActual->major < ddxExpected->major_min)
        || (ddxActual->major > ddxExpected->major_max)
-       || (ddxActual->minor < ddxExpected->minor) ) {
+       || (ddxActual->minor < ddxExpected->minor)) ) {
       fprintf(stderr, format2, driver_name, "DDX",
                       ddxExpected->major_min, ddxExpected->major_max, ddxExpected->minor,
                       ddxActual->major, ddxActual->minor, ddxActual->patch);