From: George Sapountzis <gsapountzis@gmail.com>
Date: Fri, 26 Feb 2010 02:02:41 +0000 (+0200)
Subject: remove hack for miniglx from dri/utils.c
X-Git-Tag: mesa-7.8~420
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25da8e66f8f9b5a6a20ba95412e80b1f422f48d0;p=platform%2Fupstream%2Fmesa.git

remove hack for miniglx from dri/utils.c
---

diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 8c15cbb..b6f291098 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);