diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-17 16:46:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-17 16:46:41 +0100 |
| commit | 97fb1dadc6c52adeba0ac0684129520288ab794f (patch) | |
| tree | 6a3b54bec00abec5b571087dd001a33d62bf488c /mesalib/src/mesa/main/pixeltransfer.c | |
| parent | b99cdb7509cad0b99761d19fe99637177913412b (diff) | |
| parent | d41bc08d1ae8c4784c09d8977816c0fadab1ba52 (diff) | |
| download | vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.tar.gz vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.tar.bz2 vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/swrast/s_readpix.c
Diffstat (limited to 'mesalib/src/mesa/main/pixeltransfer.c')
| -rw-r--r-- | mesalib/src/mesa/main/pixeltransfer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/pixeltransfer.c b/mesalib/src/mesa/main/pixeltransfer.c index 5e881436a..5c167e0a9 100644 --- a/mesalib/src/mesa/main/pixeltransfer.c +++ b/mesalib/src/mesa/main/pixeltransfer.c @@ -273,7 +273,7 @@ _mesa_apply_ci_transfer_ops(const struct gl_context *ctx, */ void _mesa_apply_stencil_transfer_ops(const struct gl_context *ctx, GLuint n, - GLstencil stencil[]) + GLubyte stencil[]) { if (ctx->Pixel.IndexShift != 0 || ctx->Pixel.IndexOffset != 0) { const GLint offset = ctx->Pixel.IndexOffset; @@ -300,7 +300,7 @@ _mesa_apply_stencil_transfer_ops(const struct gl_context *ctx, GLuint n, GLuint mask = ctx->PixelMaps.StoS.Size - 1; GLuint i; for (i = 0; i < n; i++) { - stencil[i] = (GLstencil)ctx->PixelMaps.StoS.Map[ stencil[i] & mask ]; + stencil[i] = (GLubyte) ctx->PixelMaps.StoS.Map[ stencil[i] & mask ]; } } } |