diff options
author | Brian Paul <[email protected]> | 2006-10-13 15:11:47 +0000 |
---|---|---|
committer | Brian Paul <[email protected]> | 2006-10-13 15:11:47 +0000 |
commit | 8a9b5518fb946462fe55a62c1da1cab94d6d12cc (patch) | |
tree | 465e076817531080be2c78d6550d14175ca8180d /src/mesa/swrast | |
parent | bf8647a58bcfcd2aacf91d2f7a4f1a55f1e1f138 (diff) |
s/GLuint/GLbitfield/
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r-- | src/mesa/swrast/s_copypix.c | 2 | ||||
-rw-r--r-- | src/mesa/swrast/s_drawpix.c | 2 | ||||
-rw-r--r-- | src/mesa/swrast/s_readpix.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c index 7c1f3c88779..accf59f3076 100644 --- a/src/mesa/swrast/s_copypix.c +++ b/src/mesa/swrast/s_copypix.c @@ -97,7 +97,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy, SWcontext *swrast = SWRAST_CONTEXT(ctx); GLint row; const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F; - const GLuint transferOps = ctx->_ImageTransferState; + const GLbitfield transferOps = ctx->_ImageTransferState; const GLboolean sink = (ctx->Pixel.MinMaxEnabled && ctx->MinMax.Sink) || (ctx->Pixel.HistogramEnabled && ctx->Histogram.Sink); GLfloat *dest, *tmpImage, *convImage; diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index 9750977d551..4270d23f064 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -555,7 +555,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y, const GLint imgX = x, imgY = y; const GLboolean zoom = ctx->Pixel.ZoomX!=1.0 || ctx->Pixel.ZoomY!=1.0; GLfloat *convImage = NULL; - GLuint transferOps = ctx->_ImageTransferState; + GLbitfield transferOps = ctx->_ImageTransferState; SWspan span; /* Try an optimized glDrawPixels first */ diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index 78441bff38f..3b7fc3f0677 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -324,7 +324,7 @@ read_rgba_pixels( GLcontext *ctx, ASSERT(width <= MAX_WIDTH); if (ctx->Pixel.Convolution2DEnabled || ctx->Pixel.Separable2DEnabled) { - const GLuint transferOps = ctx->_ImageTransferState; + const GLbitfield transferOps = ctx->_ImageTransferState; GLfloat *dest, *src, *tmpImage, *convImage; GLint row; |