Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / drivers / dri / r128 / r128_texstate.c

diff --git a/src/mesa/drivers/dri/r128/r128_texstate.c b/src/mesa/drivers/dri/r128/r128_texstate.c
index cb2b5f9536099e045e9a4cab672e473a5d5e5d8f..11441639411121747f83b1f80c88dac4aa31cf2d 100644 (file)
--- a/src/mesa/drivers/dri/r128/r128_texstate.c
+++ b/src/mesa/drivers/dri/r128/r128_texstate.c
@@ -38,7 +38,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/macros.h"
 
 #include "r128_context.h"
-#include "r128_state.h"
 #include "r128_ioctl.h"
 #include "r128_tris.h"
 #include "r128_tex.h"
@@ -193,7 +192,7 @@ static void r128SetTexImages( r128ContextPtr rmesa,
 #define INPUT_PREVIOUS                 (R128_INPUT_FACTOR_PREV_COLOR | \
                                         R128_INP_FACTOR_A_PREV_ALPHA)
 
-static GLboolean r128UpdateTextureEnv( GLcontext *ctx, int unit )
+static GLboolean r128UpdateTextureEnv( struct gl_context *ctx, int unit )
 {
    r128ContextPtr rmesa = R128_CONTEXT(ctx);
    GLint source = rmesa->tmu_source[unit];
@@ -477,7 +476,7 @@ static GLboolean r128UpdateTextureEnv( GLcontext *ctx, int unit )
    return GL_TRUE;
 }
 
-static void disable_tex( GLcontext *ctx, int unit )
+static void disable_tex( struct gl_context *ctx, int unit )
 {
    r128ContextPtr rmesa = R128_CONTEXT(ctx);
 
@@ -500,7 +499,7 @@ static void disable_tex( GLcontext *ctx, int unit )
    rmesa->blend_flags &= ~R128_BLEND_MULTITEX;
 }
 
-static GLboolean enable_tex_2d( GLcontext *ctx, int unit )
+static GLboolean enable_tex_2d( struct gl_context *ctx, int unit )
 {
    r128ContextPtr rmesa = R128_CONTEXT(ctx);
    const int source = rmesa->tmu_source[unit];
@@ -525,7 +524,7 @@ static GLboolean enable_tex_2d( GLcontext *ctx, int unit )
    return GL_TRUE;
 }
 
-static GLboolean update_tex_common( GLcontext *ctx, int unit )
+static GLboolean update_tex_common( struct gl_context *ctx, int unit )
 {
    r128ContextPtr rmesa = R128_CONTEXT(ctx);
    const int source = rmesa->tmu_source[unit];
@@ -598,7 +597,7 @@ static GLboolean update_tex_common( GLcontext *ctx, int unit )
    return r128UpdateTextureEnv( ctx, unit );
 }
 
-static GLboolean updateTextureUnit( GLcontext *ctx, int unit )
+static GLboolean updateTextureUnit( struct gl_context *ctx, int unit )
 {
    r128ContextPtr rmesa = R128_CONTEXT(ctx);
    const int source = rmesa->tmu_source[unit];
@@ -619,7 +618,7 @@ static GLboolean updateTextureUnit( GLcontext *ctx, int unit )
 }
 
 
-void r128UpdateTextureState( GLcontext *ctx )
+void r128UpdateTextureState( struct gl_context *ctx )
 {
    r128ContextPtr rmesa = R128_CONTEXT(ctx);
    GLboolean ok;