From 8d06574d2b80ea645b27a0b1c2b68054a80dad3f Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sun, 16 Sep 2012 19:54:11 +1200 Subject: [PATCH] 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 Reviewed-by: Kenneth Graunke (cherry picked from commit d30a7d2eb4b6d853bfa90169341334f2b2a643d5) --- src/mesa/main/extensions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 3d52eb8..ca639f6 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -947,7 +947,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 -- 2.7.4