diff options
| author | Nanley Chery <nanley.g.chery@intel.com> | 2016-02-05 16:20:01 -0800 |
|---|---|---|
| committer | Nanley Chery <nanley.g.chery@intel.com> | 2016-02-09 15:13:07 -0800 |
| commit | 55d56d34e0535baa2c7e1e1d8f1be11593a07fa8 (patch) | |
| tree | 68cf27102356d399dfd8035d04e17fb57c6b1608 /src/mesa/main/image.c | |
| parent | d03e5d52557ce6523eb65dfec9172d6000f5ff8d (diff) | |
| download | external_mesa3d-55d56d34e0535baa2c7e1e1d8f1be11593a07fa8.zip external_mesa3d-55d56d34e0535baa2c7e1e1d8f1be11593a07fa8.tar.gz external_mesa3d-55d56d34e0535baa2c7e1e1d8f1be11593a07fa8.tar.bz2 | |
mesa/image: Make _mesa_clip_readpixels() work with renderbuffers
v2: Use gl_renderbuffer::{Width,Height} (Jason)
Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/image.c')
| -rw-r--r-- | src/mesa/main/image.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index e79e3e6..99f253c 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -670,7 +670,7 @@ _mesa_clip_drawpixels(const struct gl_context *ctx, * so that the image region is entirely within the window bounds. * Note: this is different from _mesa_clip_drawpixels() in that the * scissor box is ignored, and we use the bounds of the current readbuffer - * surface. + * surface or the attached image. * * \return GL_TRUE if region to read is in bounds * GL_FALSE if region is completely out of bounds (nothing to read) @@ -682,6 +682,18 @@ _mesa_clip_readpixels(const struct gl_context *ctx, struct gl_pixelstore_attrib *pack) { const struct gl_framebuffer *buffer = ctx->ReadBuffer; + struct gl_renderbuffer *rb = buffer->_ColorReadBuffer; + GLsizei clip_width; + GLsizei clip_height; + + if (rb) { + clip_width = rb->Width; + clip_height = rb->Height; + } else { + clip_width = buffer->Width; + clip_height = buffer->Height; + } + if (pack->RowLength == 0) { pack->RowLength = *width; @@ -694,8 +706,8 @@ _mesa_clip_readpixels(const struct gl_context *ctx, *srcX = 0; } /* right clipping */ - if (*srcX + *width > (GLsizei) buffer->Width) - *width -= (*srcX + *width - buffer->Width); + if (*srcX + *width > clip_width) + *width -= (*srcX + *width - clip_width); if (*width <= 0) return GL_FALSE; @@ -707,8 +719,8 @@ _mesa_clip_readpixels(const struct gl_context *ctx, *srcY = 0; } /* top clipping */ - if (*srcY + *height > (GLsizei) buffer->Height) - *height -= (*srcY + *height - buffer->Height); + if (*srcY + *height > clip_height) + *height -= (*srcY + *height - clip_height); if (*height <= 0) return GL_FALSE; |