diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-24 08:59:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-24 08:59:35 +0100 |
| commit | e3a6ca7bffc785a13361efdbf81ef4776c050df0 (patch) | |
| tree | 2277a7dccab07794bd37b255ae6b5e2716e0c855 /mesalib/src/mesa/swrast | |
| parent | 780fcf7fcf5701c79568c95f32823cfa8e564665 (diff) | |
| parent | b683b8f5675e280a6dd4ab82d6b9394182798b55 (diff) | |
| download | vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.tar.gz vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.tar.bz2 vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/grabs.c
Diffstat (limited to 'mesalib/src/mesa/swrast')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_stencil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/swrast/s_stencil.c b/mesalib/src/mesa/swrast/s_stencil.c index dbcbd2be0..fb95ef14d 100644 --- a/mesalib/src/mesa/swrast/s_stencil.c +++ b/mesalib/src/mesa/swrast/s_stencil.c @@ -297,7 +297,7 @@ get_s8_values(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint i; if (rb->Format == MESA_FORMAT_S8) { - const GLuint rowStride = rb->RowStride; + const GLint rowStride = rb->RowStride; for (i = 0; i < count; i++) { if (x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) { stencil[i] = *(map + y[i] * rowStride + x[i]); @@ -305,8 +305,8 @@ get_s8_values(struct gl_context *ctx, struct gl_renderbuffer *rb, } } else { - const GLuint bpp = _mesa_get_format_bytes(rb->Format); - const GLuint rowStride = rb->RowStride * bpp; + const GLint bpp = _mesa_get_format_bytes(rb->Format); + const GLint rowStride = rb->RowStride * bpp; for (i = 0; i < count; i++) { if (x[i] >= 0 && y[i] >= 0 && x[i] < w && y[i] < h) { const GLubyte *src = map + y[i] * rowStride + x[i] * bpp; |