diff options
author | Dave Airlie <airliedfreedesktop.org> | 2006-04-03 07:41:14 +0000 |
---|---|---|
committer | Dave Airlie <airliedfreedesktop.org> | 2006-04-03 07:41:14 +0000 |
commit | 225148ea0719a28d9b4eb286c4ab2bac52610bb3 (patch) | |
tree | 5781600d9278942eeb0c376bd7a30f5ea034ce66 /src/mesa/drivers/dri | |
parent | a824813d22abf6f93dcabd7bc20fb4b1aa2cc669 (diff) |
if DDX is -1 don't do DDX check
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r-- | src/mesa/drivers/dri/common/utils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c index 7703cb61fe6..e3eca86da1b 100644 --- a/src/mesa/drivers/dri/common/utils.c +++ b/src/mesa/drivers/dri/common/utils.c @@ -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); |