summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Sapountzis <[email protected]>2010-02-26 04:02:41 +0200
committerGeorge Sapountzis <[email protected]>2010-02-26 04:02:41 +0200
commit25da8e66f8f9b5a6a20ba95412e80b1f422f48d0 (patch)
treee6eea8a621246f8746bc4901b963a68bdea31c93
parentddecefbb82bf30845fed5788fa72751f44aec4e8 (diff)
remove hack for miniglx from dri/utils.c
-rw-r--r--src/mesa/drivers/dri/common/utils.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 8c15cbbf735..b6f291098de 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -275,10 +275,9 @@ driCheckDriDdxDrmVersions3(const char * driver_name,
}
/* Check that the DDX driver version is compatible */
- /* for miniglx we pass in -1 so we can ignore the DDX version */
- if ( (ddxActual->major != -1) && ((ddxActual->major < ddxExpected->major_min)
+ if ( (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);