From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 30 Aug 2010 19:22:39 +0000 (-0700)
Subject: Fix inverted version checks in check_extra.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9b0ba68b4489557c48efa088c3884120dabc68fb;p=mesa.git

Fix inverted version checks in check_extra.

Previously, if an attribute was enabled by either a specific GL version
or an extension, the check would require -both- to be enabled.  This bug
was not discovered earlier because version checks are currently only ever
used on their own.

Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 632dadd1a5d..a3cb5ec168f 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1661,16 +1661,22 @@ check_extra(GLcontext *ctx, const char *func, const struct value_desc *d)
    for (e = d->extra; *e != EXTRA_END; e++)
       switch (*e) {
       case EXTRA_VERSION_30:
-	 if (version < 30)
-	    return GL_FALSE;
+	 if (version >= 30) {
+	    total++;
+	    enabled++;
+	 }
 	 break;
       case EXTRA_VERSION_31:
-	 if (version < 31)
-	    return GL_FALSE;
+	 if (version >= 31) {
+	    total++;
+	    enabled++;
+	 }
 	 break;
       case EXTRA_VERSION_32:
-	 if (version < 32)
-	    return GL_FALSE;
+	 if (version >= 32) {
+	    total++;
+	    enabled++;
+	 }
 	 break;
       case EXTRA_NEW_BUFFERS:
 	 if (ctx->NewState & _NEW_BUFFERS)