From b08ba56019b146786e1cde553c036dd0c4fd02e5 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 14 Sep 2012 11:09:08 +0200 Subject: fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012 --- mesalib/src/mesa/main/extensions.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'mesalib/src/mesa/main/extensions.c') diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c index 36e1fcf62..e6f4541f0 100644 --- a/mesalib/src/mesa/main/extensions.c +++ b/mesalib/src/mesa/main/extensions.c @@ -927,7 +927,7 @@ _mesa_get_extension_count(struct gl_context *ctx) base = (GLboolean *) &ctx->Extensions; for (i = extension_table; i->name != 0; ++i) { - if (base[i->offset]) { + if (base[i->offset] && (i->api_set & (1 << ctx->API))) { ctx->Extensions.Count++; } } @@ -947,10 +947,11 @@ _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 (n == index && base[i->offset]) { - return (const GLubyte*) i->name; - } else if (base[i->offset]) { - ++n; + if (base[i->offset] & (i->api_set & (1 << ctx->API))) { + if (n == index) + return (const GLubyte*) i->name; + else + ++n; } } -- cgit v1.2.3