Mesa (master): mesa: make _mesa_init_extensions context-independent

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 858452e54242011d77e4d0364ff05497795c3c4f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=858452e54242011d77e4d0364ff05497795c3c4f

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Aug  3 04:42:50 2014 +0200

mesa: make _mesa_init_extensions context-independent

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/mesa/main/context.c    |    2 +-
 src/mesa/main/extensions.c |    8 ++++----
 src/mesa/main/extensions.h |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 0f28dbf..e08f728 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -793,7 +793,7 @@ init_attrib_groups(struct gl_context *ctx)
    _mesa_init_constants( ctx );
 
    /* Extensions */
-   _mesa_init_extensions( ctx );
+   _mesa_init_extensions(&ctx->Extensions);
 
    /* Attribute Groups */
    _mesa_init_accum( ctx );
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index d60838a..57776c1 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -667,9 +667,9 @@ _mesa_one_time_init_extension_overrides(void)
  * Note: Sets gl_extensions.dummy_true to true.
  */
 void
-_mesa_init_extensions( struct gl_context *ctx )
+_mesa_init_extensions(struct gl_extensions *extensions)
 {
-   GLboolean *base = (GLboolean *) &ctx->Extensions;
+   GLboolean *base = (GLboolean *) extensions;
    GLboolean *sentinel = base + o(extension_sentinel);
    GLboolean *i;
 
@@ -678,8 +678,8 @@ _mesa_init_extensions( struct gl_context *ctx )
       *i = GL_FALSE;
 
    /* Then, selectively turn default extensions on. */
-   ctx->Extensions.dummy_true = GL_TRUE;
-   ctx->Extensions.EXT_texture3D = GL_TRUE;
+   extensions->dummy_true = GL_TRUE;
+   extensions->EXT_texture3D = GL_TRUE;
 }
 
 
diff --git a/src/mesa/main/extensions.h b/src/mesa/main/extensions.h
index 3a404d2..595512a 100644
--- a/src/mesa/main/extensions.h
+++ b/src/mesa/main/extensions.h
@@ -45,7 +45,7 @@ extern void _mesa_enable_sw_extensions(struct gl_context *ctx);
 
 extern void _mesa_one_time_init_extension_overrides(void);
 
-extern void _mesa_init_extensions(struct gl_context *ctx);
+extern void _mesa_init_extensions(struct gl_extensions *extentions);
 
 extern GLubyte *_mesa_make_extension_string(struct gl_context *ctx);