Mesa (7.10): mesa: Move declaration before code in extensions.c.
Ian Romanick
idr at kemper.freedesktop.org
Mon Feb 28 21:23:55 UTC 2011
Module: Mesa
Branch: 7.10
Commit: f012e8832be0c42b0d307b6f4b8081635adfc958
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f012e8832be0c42b0d307b6f4b8081635adfc958
Author: Vinson Lee <vlee at vmware.com>
Date: Wed Jan 12 16:23:11 2011 -0800
mesa: Move declaration before code in extensions.c.
Fixes SCons build.
(cherry picked from commit 356e2e962f424215b41bcf67d7114b83471e8813)
---
src/mesa/main/extensions.c | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 7041dbd..d8f8206 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -649,13 +649,15 @@ _mesa_enable_2_1_extensions(struct gl_context *ctx)
static GLboolean
set_extension( struct gl_context *ctx, const char *name, GLboolean state )
{
+ size_t offset;
+
if (ctx->Extensions.String) {
/* The string was already queried - can't change it now! */
_mesa_problem(ctx, "Trying to enable/disable extension after glGetString(GL_EXTENSIONS): %s", name);
return GL_FALSE;
}
- size_t offset = name_to_offset(name);
+ offset = name_to_offset(name);
if (offset == 0) {
_mesa_problem(ctx, "Trying to enable/disable unknown extension %s",
name);
@@ -702,13 +704,16 @@ _mesa_disable_extension( struct gl_context *ctx, const char *name )
GLboolean
_mesa_extension_is_enabled( struct gl_context *ctx, const char *name )
{
+ size_t offset;
+ GLboolean *base;
+
if (name == 0)
return GL_FALSE;
- size_t offset = name_to_offset(name);
+ offset = name_to_offset(name);
if (offset == 0)
return GL_FALSE;
- GLboolean *base = (GLboolean *) &ctx->Extensions;
+ base = (GLboolean *) &ctx->Extensions;
return base[offset];
}
@@ -863,11 +868,13 @@ _mesa_make_extension_string(struct gl_context *ctx)
GLuint
_mesa_get_extension_count(struct gl_context *ctx)
{
+ GLboolean *base;
+
/* only count once */
if (ctx->Extensions.Count != 0)
return ctx->Extensions.Count;
- GLboolean *base = (GLboolean *) &ctx->Extensions;
+ base = (GLboolean *) &ctx->Extensions;
for (const struct extension *i = extension_table; i->name != 0; ++i) {
if (base[i->offset]) {
ctx->Extensions.Count++;
@@ -882,11 +889,14 @@ _mesa_get_extension_count(struct gl_context *ctx)
const GLubyte *
_mesa_get_enabled_extension(struct gl_context *ctx, GLuint index)
{
+ const GLboolean *base;
+ size_t n;
+
if (index < 0)
return NULL;
- const GLboolean *base = (GLboolean*) &ctx->Extensions;
- size_t n = 0;
+ base = (GLboolean*) &ctx->Extensions;
+ n = 0;
for (const struct extension *i = extension_table; i->name != 0; ++i) {
if (n == index && base[i->offset]) {
return (GLubyte*) i->name;
More information about the mesa-commit
mailing list