From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 16 Sep 2012 07:54:11 +0000 (+1200)
Subject: mesa: fix dropped && in glGetStringi()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d30a7d2eb4b6d853bfa90169341334f2b2a643d5;p=mesa.git

mesa: fix dropped && in glGetStringi()

This fixes glGetStringi(GL_EXTENSIONS,.. for core contexts. Previously,
all extension names returned would be NULL.

NOTE: This is a candidate for release branches.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 6fe7ad1aebb..bd7c7baf912 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -885,7 +885,7 @@ _mesa_get_enabled_extension(struct gl_context *ctx, GLuint index)
    base = (GLboolean*) &ctx->Extensions;
    n = 0;
    for (i = extension_table; i->name != 0; ++i) {
-      if (base[i->offset] & (i->api_set & (1 << ctx->API))) {
+      if (base[i->offset] && (i->api_set & (1 << ctx->API))) {
          if (n == index)
             return (const GLubyte*) i->name;
          else