Mesa (master): remove hack for miniglx from dri/utils.c
George Sapountzis
gsap7 at kemper.freedesktop.org
Fri Feb 26 02:05:41 UTC 2010
Module: Mesa
Branch: master
Commit: 25da8e66f8f9b5a6a20ba95412e80b1f422f48d0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=25da8e66f8f9b5a6a20ba95412e80b1f422f48d0
Author: George Sapountzis <gsapountzis at gmail.com>
Date: Fri Feb 26 04:02:41 2010 +0200
remove hack for miniglx from dri/utils.c
---
src/mesa/drivers/dri/common/utils.c | 5 ++---
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 8c15cbb..b6f2910 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);
More information about the mesa-commit
mailing list