fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

s/GLuint/GLbitfield/

Browse source
This commit is contained in:
Brian Paul 2006-10-13 15:11:47 +00:00
parent bf8647a58b
commit 8a9b5518fb
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mesa/main/image.c
View file

@ -990,7 +990,7 @@ _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
* as indicated by the transferOps bitmask
*/
void
_mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLuint transferOps,
_mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLbitfield transferOps,
GLuint n, GLfloat rgba[][4])
{
/* scale & bias */
@ -1072,7 +1072,7 @@ _mesa_pack_rgba_span_float( GLcontext *ctx,
GLenum dstFormat, GLenum dstType,
GLvoid *dstAddr,
const struct gl_pixelstore_attrib *dstPacking,
GLuint transferOps )
GLbitfield transferOps )
{
const GLint comps = _mesa_components_in_format(dstFormat);
GLfloat rgbaCopy[MAX_WIDTH][4], luminance[MAX_WIDTH];
@ -2752,7 +2752,7 @@ _mesa_unpack_color_span_chan( GLcontext *ctx,
GLenum srcFormat, GLenum srcType,
const GLvoid *source,
const struct gl_pixelstore_attrib *srcPacking,
GLuint transferOps )
GLbitfield transferOps )
{
ASSERT(dstFormat == GL_ALPHA ||
dstFormat == GL_LUMINANCE ||
@ -3092,7 +3092,7 @@ _mesa_unpack_color_span_float( GLcontext *ctx,
GLenum srcFormat, GLenum srcType,
const GLvoid *source,
const struct gl_pixelstore_attrib *srcPacking,
GLuint transferOps )
GLbitfield transferOps )
{
ASSERT(dstFormat == GL_ALPHA ||
dstFormat == GL_LUMINANCE ||
@ -3318,7 +3318,7 @@ _mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
GLenum dstType, GLvoid *dest,
GLenum srcType, const GLvoid *source,
const struct gl_pixelstore_attrib *srcPacking,
GLuint transferOps )
GLbitfield transferOps )
{
ASSERT(srcType == GL_BITMAP ||
srcType == GL_UNSIGNED_BYTE ||
@ -3401,7 +3401,7 @@ void
_mesa_pack_index_span( const GLcontext *ctx, GLuint n,
GLenum dstType, GLvoid *dest, const GLuint *source,
const struct gl_pixelstore_attrib *dstPacking,
GLuint transferOps )
GLbitfield transferOps )
{
GLuint indexes[MAX_WIDTH];
@ -3537,7 +3537,7 @@ _mesa_unpack_stencil_span( const GLcontext *ctx, GLuint n,
GLenum dstType, GLvoid *dest,
GLenum srcType, const GLvoid *source,
const struct gl_pixelstore_attrib *srcPacking,
GLuint transferOps )
GLbitfield transferOps )
{
ASSERT(srcType == GL_BITMAP ||
srcType == GL_UNSIGNED_BYTE ||

14
src/mesa/main/image.h
View file

@ -112,7 +112,7 @@ _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
extern void
_mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLuint transferOps,
_mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLbitfield transferOps,
GLuint n, GLfloat rgba[][4]);
extern void
@ -120,7 +120,7 @@ _mesa_pack_rgba_span_float( GLcontext *ctx,
GLuint n, CONST GLfloat rgba[][4],
GLenum dstFormat, GLenum dstType, GLvoid *dstAddr,
const struct gl_pixelstore_attrib *dstPacking,
GLuint transferOps );
GLbitfield transferOps );
extern void
@ -129,7 +129,7 @@ _mesa_unpack_color_span_chan( GLcontext *ctx,
GLenum srcFormat, GLenum srcType,
const GLvoid *source,
const struct gl_pixelstore_attrib *srcPacking,
GLuint transferOps );
GLbitfield transferOps );
extern void
@ -138,7 +138,7 @@ _mesa_unpack_color_span_float( GLcontext *ctx,
GLenum srcFormat, GLenum srcType,
const GLvoid *source,
const struct gl_pixelstore_attrib *srcPacking,
GLuint transferOps );
GLbitfield transferOps );
extern void
@ -146,14 +146,14 @@ _mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
GLenum dstType, GLvoid *dest,
GLenum srcType, const GLvoid *source,
const struct gl_pixelstore_attrib *srcPacking,
GLuint transferOps );
GLbitfield transferOps );
extern void
_mesa_pack_index_span( const GLcontext *ctx, GLuint n,
GLenum dstType, GLvoid *dest, const GLuint *source,
const struct gl_pixelstore_attrib *dstPacking,
GLuint transferOps );
GLbitfield transferOps );
extern void
@ -161,7 +161,7 @@ _mesa_unpack_stencil_span( const GLcontext *ctx, GLuint n,
GLenum dstType, GLvoid *dest,
GLenum srcType, const GLvoid *source,
const struct gl_pixelstore_attrib *srcPacking,
GLuint transferOps );
GLbitfield transferOps );
extern void
_mesa_pack_stencil_span( const GLcontext *ctx, GLuint n,

2
src/mesa/swrast/s_copypix.c
View file

@ -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;

2
src/mesa/swrast/s_drawpix.c
View file

@ -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 */

2
src/mesa/swrast/s_readpix.c
View file

@ -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;