diff options
| -rw-r--r-- | src/mesa/swrast/s_blit.c | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_copypix.c | 12 | ||||
| -rw-r--r-- | src/mesa/swrast/swrast.h | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c index 48936d32917..16e5b8c1cb1 100644 --- a/src/mesa/swrast/s_blit.c +++ b/src/mesa/swrast/s_blit.c @@ -789,7 +789,7 @@ _swrast_BlitFramebuffer(struct gl_context *ctx, } if (!mask) - return; + return; } if (filter == GL_NEAREST) { diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c index eeea20e8671..e21c69dbcfa 100644 --- a/src/mesa/swrast/s_copypix.c +++ b/src/mesa/swrast/s_copypix.c @@ -620,9 +620,9 @@ map_readbuffer(struct gl_context *ctx, GLenum type) * By time we get here, all parameters will have been error-checked. */ void -_swrast_CopyPixels( struct gl_context *ctx, - GLint srcx, GLint srcy, GLsizei width, GLsizei height, - GLint destx, GLint desty, GLenum type ) +_swrast_CopyPixels(struct gl_context *ctx, + GLint srcx, GLint srcy, GLsizei width, GLsizei height, + GLint destx, GLint desty, GLenum type) { SWcontext *swrast = SWRAST_CONTEXT(ctx); struct gl_renderbuffer *rb; @@ -634,9 +634,9 @@ _swrast_CopyPixels( struct gl_context *ctx, _swrast_validate_derived( ctx ); if (!(SWRAST_CONTEXT(ctx)->_RasterMask != 0x0 || - ctx->Pixel.ZoomX != 1.0F || - ctx->Pixel.ZoomY != 1.0F || - ctx->_ImageTransferState) && + ctx->Pixel.ZoomX != 1.0F || + ctx->Pixel.ZoomY != 1.0F || + ctx->_ImageTransferState) && swrast_fast_copy_pixels(ctx, ctx->ReadBuffer, ctx->DrawBuffer, srcx, srcy, width, height, destx, desty, type)) { diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h index 8847bced0cf..a89dc6cda2c 100644 --- a/src/mesa/swrast/swrast.h +++ b/src/mesa/swrast/swrast.h @@ -132,11 +132,11 @@ _swrast_Bitmap( struct gl_context *ctx, const GLubyte *bitmap ); extern void -_swrast_CopyPixels( struct gl_context *ctx, - GLint srcx, GLint srcy, - GLint destx, GLint desty, - GLsizei width, GLsizei height, - GLenum type ); +_swrast_CopyPixels(struct gl_context *ctx, + GLint srcx, GLint srcy, + GLint destx, GLint desty, + GLsizei width, GLsizei height, + GLenum type); extern GLboolean swrast_fast_copy_pixels(struct gl_context *ctx, |