Drop GLcontext typedef and use struct gl_context instead

1 files changed, 22 insertions, 22 deletions

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 99583a6345d..bc8cbef1320 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -228,7 +228,7 @@ static const struct {
  * This is a convenience function used by the XMesa, OSMesa, GGI drivers, etc.
  */
 void
-_mesa_enable_sw_extensions(GLcontext *ctx)
+_mesa_enable_sw_extensions(struct gl_context *ctx)
 {
    /*ctx->Extensions.ARB_copy_buffer = GL_TRUE;*/
    ctx->Extensions.ARB_depth_clamp = GL_TRUE;
@@ -388,7 +388,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
  * Enable common EXT extensions in the ARB_imaging subset.
  */
 void
-_mesa_enable_imaging_extensions(GLcontext *ctx)
+_mesa_enable_imaging_extensions(struct gl_context *ctx)
 {
    ctx->Extensions.EXT_blend_color = GL_TRUE;
    ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
@@ -403,7 +403,7 @@ _mesa_enable_imaging_extensions(GLcontext *ctx)
  * A convenience function to be called by drivers.
  */
 void
-_mesa_enable_1_3_extensions(GLcontext *ctx)
+_mesa_enable_1_3_extensions(struct gl_context *ctx)
 {
    /*ctx->Extensions.ARB_multisample = GL_TRUE;*/
    ctx->Extensions.ARB_multitexture = GL_TRUE;
@@ -423,7 +423,7 @@ _mesa_enable_1_3_extensions(GLcontext *ctx)
  * A convenience function to be called by drivers.
  */
 void
-_mesa_enable_1_4_extensions(GLcontext *ctx)
+_mesa_enable_1_4_extensions(struct gl_context *ctx)
 {
    ctx->Extensions.ARB_depth_texture = GL_TRUE;
    ctx->Extensions.ARB_shadow = GL_TRUE;
@@ -449,7 +449,7 @@ _mesa_enable_1_4_extensions(GLcontext *ctx)
  * A convenience function to be called by drivers.
  */
 void
-_mesa_enable_1_5_extensions(GLcontext *ctx)
+_mesa_enable_1_5_extensions(struct gl_context *ctx)
 {
    ctx->Extensions.ARB_occlusion_query = GL_TRUE;
    /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/
@@ -462,7 +462,7 @@ _mesa_enable_1_5_extensions(GLcontext *ctx)
  * A convenience function to be called by drivers.
  */
 void
-_mesa_enable_2_0_extensions(GLcontext *ctx)
+_mesa_enable_2_0_extensions(struct gl_context *ctx)
 {
    /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
 #if FEATURE_ARB_fragment_shader
@@ -489,7 +489,7 @@ _mesa_enable_2_0_extensions(GLcontext *ctx)
  * A convenience function to be called by drivers.
  */
 void
-_mesa_enable_2_1_extensions(GLcontext *ctx)
+_mesa_enable_2_1_extensions(struct gl_context *ctx)
 {
 #if FEATURE_EXT_pixel_buffer_object
    ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
@@ -505,7 +505,7 @@ _mesa_enable_2_1_extensions(GLcontext *ctx)
  * \return GL_TRUE for success, GL_FALSE if invalid extension name
  */
 static GLboolean
-set_extension( GLcontext *ctx, const char *name, GLboolean state )
+set_extension( struct gl_context *ctx, const char *name, GLboolean state )
 {
    GLboolean *base = (GLboolean *) &ctx->Extensions;
    GLuint i;
@@ -534,7 +534,7 @@ set_extension( GLcontext *ctx, const char *name, GLboolean state )
  * Typically called by drivers.
  */
 void
-_mesa_enable_extension( GLcontext *ctx, const char *name )
+_mesa_enable_extension( struct gl_context *ctx, const char *name )
 {
    if (!set_extension(ctx, name, GL_TRUE))
       _mesa_problem(ctx, "Trying to enable unknown extension: %s", name);
@@ -546,7 +546,7 @@ _mesa_enable_extension( GLcontext *ctx, const char *name )
  * XXX is this really needed???
  */
 void
-_mesa_disable_extension( GLcontext *ctx, const char *name )
+_mesa_disable_extension( struct gl_context *ctx, const char *name )
 {
    if (!set_extension(ctx, name, GL_FALSE))
       _mesa_problem(ctx, "Trying to disable unknown extension: %s", name);
@@ -557,7 +557,7 @@ _mesa_disable_extension( GLcontext *ctx, const char *name )
  * Check if the i-th extension is enabled.
  */
 static GLboolean
-extension_enabled(GLcontext *ctx, GLuint index)
+extension_enabled(struct gl_context *ctx, GLuint index)
 {
    const GLboolean *base = (const GLboolean *) &ctx->Extensions;
    if (!default_extensions[index].flag_offset ||
@@ -574,7 +574,7 @@ extension_enabled(GLcontext *ctx, GLuint index)
  * Test if the named extension is enabled in this context.
  */
 GLboolean
-_mesa_extension_is_enabled( GLcontext *ctx, const char *name )
+_mesa_extension_is_enabled( struct gl_context *ctx, const char *name )
 {
    GLuint i;
 
@@ -616,7 +616,7 @@ append(const char *a, const char *b)
  * Return a string of the unknown/leftover names.
  */
 static const char *
-get_extension_override( GLcontext *ctx )
+get_extension_override( struct gl_context *ctx )
 {
    const char *envExt = _mesa_getenv("MESA_EXTENSION_OVERRIDE");
    char *extraExt = NULL;
@@ -667,7 +667,7 @@ get_extension_override( GLcontext *ctx )
  * To be called during context initialization.
  */
 void
-_mesa_init_extensions( GLcontext *ctx )
+_mesa_init_extensions( struct gl_context *ctx )
 {
    GLboolean *base = (GLboolean *) &ctx->Extensions;
    GLuint i;
@@ -686,7 +686,7 @@ _mesa_init_extensions( GLcontext *ctx )
  * glGetString(GL_EXTENSIONS) is called.
  */
 static GLubyte *
-compute_extensions( GLcontext *ctx )
+compute_extensions( struct gl_context *ctx )
 {
    const char *extraExt = get_extension_override(ctx);
    GLuint extStrLen = 0;
@@ -753,7 +753,7 @@ append_extension(GLubyte **str, const char *ext)
 
 
 static size_t
-make_extension_string_es1(const GLcontext *ctx, GLubyte *str)
+make_extension_string_es1(const struct gl_context *ctx, GLubyte *str)
 {
    size_t len = 0;
 
@@ -835,7 +835,7 @@ make_extension_string_es1(const GLcontext *ctx, GLubyte *str)
 
 
 static GLubyte *
-compute_extensions_es1(const GLcontext *ctx)
+compute_extensions_es1(const struct gl_context *ctx)
 {
    GLubyte *s;
    unsigned int len;
@@ -850,7 +850,7 @@ compute_extensions_es1(const GLcontext *ctx)
 }
 
 static size_t
-make_extension_string_es2(const GLcontext *ctx, GLubyte *str)
+make_extension_string_es2(const struct gl_context *ctx, GLubyte *str)
 {
    size_t len = 0;
 
@@ -904,7 +904,7 @@ make_extension_string_es2(const GLcontext *ctx, GLubyte *str)
 }
 
 static GLubyte *
-compute_extensions_es2(GLcontext *ctx)
+compute_extensions_es2(struct gl_context *ctx)
 {
    GLubyte *s;
    unsigned int len;
@@ -920,7 +920,7 @@ compute_extensions_es2(GLcontext *ctx)
 
 
 GLubyte *
-_mesa_make_extension_string(GLcontext *ctx)
+_mesa_make_extension_string(struct gl_context *ctx)
 {
    switch (ctx->API) {
    case API_OPENGL:
@@ -939,7 +939,7 @@ _mesa_make_extension_string(GLcontext *ctx)
  * Return number of enabled extensions.
  */
 GLuint
-_mesa_get_extension_count(GLcontext *ctx)
+_mesa_get_extension_count(struct gl_context *ctx)
 {
    GLuint i;
 
@@ -964,7 +964,7 @@ _mesa_get_extension_count(GLcontext *ctx)
  * Return name of i-th enabled extension
  */
 const GLubyte *
-_mesa_get_enabled_extension(GLcontext *ctx, GLuint index)
+_mesa_get_enabled_extension(struct gl_context *ctx, GLuint index)
 {
    GLuint i;