4 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index bdd1172709..0b38fb395a 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -54,7 +54,7 @@
 static void
 _swrast_update_rasterflags( GLcontext *ctx )
 {
-   GLuint rasterMask = 0;
+   GLbitfield rasterMask = 0;
 
    if (ctx->Color.AlphaEnabled)           rasterMask |= ALPHATEST_BIT;
    if (ctx->Color.BlendEnabled)           rasterMask |= BLEND_BIT;
diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
index 10b1d36071..d08636c2d6 100644
--- a/src/mesa/swrast/s_context.h
+++ b/src/mesa/swrast/s_context.h
@@ -139,7 +139,7 @@ struct sw_span {
     * This bitmask (of  \link SpanFlags SPAN_* flags\endlink) indicates
     * which of the x/xStep variables are relevant.
     */
-   GLuint interpMask;
+   GLbitfield interpMask;
 
    /* For horizontal spans, step is the partial derivative wrt X.
     * For lines, step is the delta from one fragment to the next.
@@ -185,7 +185,7 @@ struct sw_span {
     * This bitmask (of \link SpanFlags SPAN_* flags\endlink) indicates
     * which of the fragment arrays in the span_arrays struct are relevant.
     */
-   GLuint arrayMask;
+   GLbitfield arrayMask;
 
    /**
     * We store the arrays of fragment values in a separate struct so
@@ -279,7 +279,7 @@ typedef struct
    /** Derived values, invalidated on statechanges, updated from
     * _swrast_validate_derived():
     */
-   GLuint _RasterMask;
+   GLbitfield _RasterMask;
    GLfloat _MinMagThresh[MAX_TEXTURE_IMAGE_UNITS];
    GLfloat _BackfaceSign;
    GLboolean _PreferPixelFog;    /* Compute fog blend factor per fragment? */
@@ -296,7 +296,7 @@ typedef struct
    /* Working values:
     */
    GLuint StippleCounter;    /**< Line stipple counter */
-   GLuint NewState;
+   GLbitfield NewState;
    GLuint StateChanges;
    GLenum Primitive;    /* current primitive being drawn (ala glBegin) */
 
@@ -315,7 +315,7 @@ typedef struct
 
    /** Function pointers for dispatch behind public entrypoints. */
    /*@{*/
-   void (*InvalidateState)( GLcontext *ctx, GLuint new_state );
+   void (*InvalidateState)( GLcontext *ctx, GLbitfield new_state );
 
    swrast_point_func Point;
    swrast_line_func Line;
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index 709f9a13c7..29356ca4b6 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -812,8 +812,8 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
     * General solution
     */
    {
-      const GLuint interpMask = span.interpMask;
-      const GLuint arrayMask = span.arrayMask;
+      const GLbitfield interpMask = span.interpMask;
+      const GLbitfield arrayMask = span.arrayMask;
       GLint row, skipPixels = 0;
 
       /* if the span is wider than MAX_WIDTH we have to do it in chunks */
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index d01973df72..780f1b6399 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -775,8 +775,8 @@ _swrast_write_index_span( GLcontext *ctx, struct sw_span *span)
    const SWcontext *swrast = SWRAST_CONTEXT(ctx);
    const struct gl_framebuffer *fb = ctx->DrawBuffer;
    const GLuint output = 0;
-   const GLuint origInterpMask = span->interpMask;
-   const GLuint origArrayMask = span->arrayMask;
+   const GLbitfield origInterpMask = span->interpMask;
+   const GLbitfield origArrayMask = span->arrayMask;
    GLuint buf;
 
    ASSERT(span->end <= MAX_WIDTH);
@@ -1078,8 +1078,8 @@ _swrast_write_rgba_span( GLcontext *ctx, struct sw_span *span)
 {
    const GLuint colorMask = *((GLuint *) ctx->Color.ColorMask);
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   const GLuint origInterpMask = span->interpMask;
-   const GLuint origArrayMask = span->arrayMask;
+   const GLbitfield origInterpMask = span->interpMask;
+   const GLbitfield origArrayMask = span->arrayMask;
 
    ASSERT(span->primitive == GL_POINT  ||  span->primitive == GL_LINE ||
 	  span->primitive == GL_POLYGON  ||  span->primitive == GL_BITMAP);