summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/extensions.c
diff options
context:
space:
mode:
authorChris Forbes <chrisf@ijw.co.nz>2012-09-16 19:54:11 +1200
committerKenneth Graunke <kenneth@whitecape.org>2012-09-16 01:47:00 -0700
commitd30a7d2eb4b6d853bfa90169341334f2b2a643d5 (patch)
tree96661251b224bed347c4a1d5005c560492214938 /src/mesa/main/extensions.c
parent679c93ff89c71cbd3b1d24e88abd38f00b8c1f02 (diff)
downloadexternal_mesa3d-d30a7d2eb4b6d853bfa90169341334f2b2a643d5.zip
external_mesa3d-d30a7d2eb4b6d853bfa90169341334f2b2a643d5.tar.gz
external_mesa3d-d30a7d2eb4b6d853bfa90169341334f2b2a643d5.tar.bz2
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>
Diffstat (limited to 'src/mesa/main/extensions.c')
-rw-r--r--src/mesa/main/extensions.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 6fe7ad1..bd7c7ba 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