summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-09-16 01:41:03 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-09-16 01:41:03 +0000
commit8885b077ed7180e93a002d93864a8ff7b0bb81f3 (patch)
tree42479194b5195a8e22ea4ba7a4cd573eb3acb471 /src/mesa
parente00ac11d4dd05c56584622dc2707bbdcfe4b2707 (diff)
more GLuint->GLbitfield changes
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_context.c6
-rw-r--r--src/mesa/swrast/s_context.h8
-rw-r--r--src/mesa/swrast/swrast.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 0b38fb395a8..2b39ffce0b6 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -403,14 +403,14 @@ _swrast_validate_texture_sample( GLcontext *ctx, GLuint texUnit,
static void
-_swrast_sleep( GLcontext *ctx, GLuint new_state )
+_swrast_sleep( GLcontext *ctx, GLbitfield new_state )
{
(void) ctx; (void) new_state;
}
static void
-_swrast_invalidate_state( GLcontext *ctx, GLuint new_state )
+_swrast_invalidate_state( GLcontext *ctx, GLbitfield new_state )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLuint i;
@@ -529,7 +529,7 @@ _swrast_Point( GLcontext *ctx, const SWvertex *v0 )
}
void
-_swrast_InvalidateState( GLcontext *ctx, GLuint new_state )
+_swrast_InvalidateState( GLcontext *ctx, GLbitfield new_state )
{
if (SWRAST_DEBUG) {
_mesa_debug(ctx, "_swrast_InvalidateState\n");
diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
index d08636c2d62..e4c48fab9a2 100644
--- a/src/mesa/swrast/s_context.h
+++ b/src/mesa/swrast/s_context.h
@@ -308,9 +308,9 @@ typedef struct
void (*choose_line)( GLcontext * );
void (*choose_triangle)( GLcontext * );
- GLuint invalidate_point;
- GLuint invalidate_line;
- GLuint invalidate_triangle;
+ GLbitfield invalidate_point;
+ GLbitfield invalidate_line;
+ GLbitfield invalidate_triangle;
/*@}*/
/** Function pointers for dispatch behind public entrypoints. */
@@ -345,7 +345,7 @@ typedef struct
*/
struct sw_span PointSpan;
- /** Internal hooks, kept uptodate by the same mechanism as above.
+ /** Internal hooks, kept up to date by the same mechanism as above.
*/
blend_func BlendFunc;
texture_sample_func TextureSample[MAX_TEXTURE_IMAGE_UNITS];
diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h
index 0bf91911a38..9e63db02482 100644
--- a/src/mesa/swrast/swrast.h
+++ b/src/mesa/swrast/swrast.h
@@ -173,7 +173,7 @@ _swrast_render_finish( GLcontext *ctx );
/* Tell the software rasterizer about core state changes.
*/
extern void
-_swrast_InvalidateState( GLcontext *ctx, GLuint new_state );
+_swrast_InvalidateState( GLcontext *ctx, GLbitfield new_state );
/* Configure software rasterizer to match hardware rasterizer characteristics:
*/