X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi810%2Fi810texstate.c;h=5b505e71a4815c885d0e1d334f9ec9ebf05b73f7;hb=cd6a31cd4a9ea6deef4778c2eaef2d47240c3a6e;hp=bff28c11c8942c1503e17eacc07de15db4638520;hpb=1f196b786d6bd0c6a5dbdc638574ff716cc3d4de;p=mesa.git

diff --git a/src/mesa/drivers/dri/i810/i810texstate.c b/src/mesa/drivers/dri/i810/i810texstate.c
index bff28c11c89..5b505e71a48 100644
--- a/src/mesa/drivers/dri/i810/i810texstate.c
+++ b/src/mesa/drivers/dri/i810/i810texstate.c
@@ -191,7 +191,7 @@ static const unsigned operand_modifiers[] = {
  * a reasonable place to make note of it.
  */
 static GLboolean
-i810UpdateTexEnvCombine( GLcontext *ctx, GLuint unit, 
+i810UpdateTexEnvCombine( struct gl_context *ctx, GLuint unit, 
 			 int * color_stage, int * alpha_stage )
 {
    i810ContextPtr imesa = I810_CONTEXT(ctx);
@@ -533,7 +533,7 @@ i810UpdateTexEnvCombine( GLcontext *ctx, GLuint unit,
    return GL_TRUE;
 }
 
-static GLboolean enable_tex_common( GLcontext *ctx, GLuint unit )
+static GLboolean enable_tex_common( struct gl_context *ctx, GLuint unit )
 {
    i810ContextPtr imesa = I810_CONTEXT(ctx);
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
@@ -570,7 +570,7 @@ static GLboolean enable_tex_common( GLcontext *ctx, GLuint unit )
   return GL_TRUE;
 }
 
-static GLboolean enable_tex_rect( GLcontext *ctx, GLuint unit )
+static GLboolean enable_tex_rect( struct gl_context *ctx, GLuint unit )
 {
   i810ContextPtr imesa = I810_CONTEXT(ctx);
   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
@@ -590,7 +590,7 @@ static GLboolean enable_tex_rect( GLcontext *ctx, GLuint unit )
   return GL_TRUE;
 }
 
-static GLboolean enable_tex_2d( GLcontext *ctx, GLuint unit )
+static GLboolean enable_tex_2d( struct gl_context *ctx, GLuint unit )
 {
   i810ContextPtr imesa = I810_CONTEXT(ctx);
   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
@@ -610,7 +610,7 @@ static GLboolean enable_tex_2d( GLcontext *ctx, GLuint unit )
   return GL_TRUE;
 }
 
-static void disable_tex( GLcontext *ctx, GLuint unit )
+static void disable_tex( struct gl_context *ctx, GLuint unit )
 {
   i810ContextPtr imesa = I810_CONTEXT(ctx);
 
@@ -627,7 +627,7 @@ static void disable_tex( GLcontext *ctx, GLuint unit )
  * 1D textures should be supported!  Just use a 2D texture with the second
  * texture coordinate value fixed at 0.0.
  */
-static void i810UpdateTexUnit( GLcontext *ctx, GLuint unit, 
+static void i810UpdateTexUnit( struct gl_context *ctx, GLuint unit, 
 			      int * next_color_stage, int * next_alpha_stage )
 {
    i810ContextPtr imesa = I810_CONTEXT(ctx);
@@ -664,7 +664,7 @@ static void i810UpdateTexUnit( GLcontext *ctx, GLuint unit,
 }
 
 
-void i810UpdateTextureState( GLcontext *ctx )
+void i810UpdateTextureState( struct gl_context *ctx )
 {
    static const unsigned color_pass[3] = {
       GFX_OP_MAP_COLOR_STAGES | MC_STAGE_0 | MC_UPDATE_DEST | MC_DEST_CURRENT