summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2011-10-11 20:41:01 -0700
committerEric Anholt <eric@anholt.net>2011-11-03 23:29:52 -0700
commitb832ac974f2b5a0f07ff9b7bb9338e8d6942eb74 (patch)
treefb6bd704b944d2c84df0f7f82d18adff249562a4 /src/mesa/swrast
parentff27e058bc93338ef0dbe322ab4e588ea4bbec0d (diff)
swrast: Make the packed depth/stencil read fastpath use MapRenderbuffer.
This also makes it handle 24/8 vs 8/24, fixing piglit depthstencil-default_fb-readpixels-24_8 on i965. While here, avoid incorrectly fast-pathing if packing->SwapBytes is set. v2: Move the unpack code to format_unpack.c, fix BUFFER_DEPTH typo v3: Fix signed/unsigned comparison. Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r--src/mesa/swrast/s_readpix.c84
1 files changed, 55 insertions, 29 deletions
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index 6351ec123ea..587cabee3b5 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -365,6 +365,55 @@ read_rgba_pixels( struct gl_context *ctx,
}
}
+/**
+ * For a packed depth/stencil buffer being read as depth/stencil, memcpy the
+ * data (possibly swapping 8/24 vs 24/8 as we go).
+ */
+static GLboolean
+fast_read_depth_stencil_pixels(struct gl_context *ctx,
+ GLint x, GLint y,
+ GLsizei width, GLsizei height,
+ GLenum type, GLvoid *pixels,
+ const struct gl_pixelstore_attrib *packing)
+{
+ struct gl_framebuffer *fb = ctx->ReadBuffer;
+ struct gl_renderbuffer *rb = fb->Attachment[BUFFER_DEPTH].Renderbuffer;
+ struct gl_renderbuffer *stencilRb = fb->Attachment[BUFFER_STENCIL].Renderbuffer;
+ GLubyte *dst, *map;
+ int stride, dstStride, i;
+
+ if (rb != stencilRb)
+ return GL_FALSE;
+
+ if (type != GL_UNSIGNED_INT_24_8)
+ return GL_FALSE;
+
+ if (rb->Format != MESA_FORMAT_Z24_S8 &&
+ rb->Format != MESA_FORMAT_S8_Z24)
+ return GL_FALSE;
+
+ ctx->Driver.MapRenderbuffer(ctx, rb, x, y, width, height, GL_MAP_READ_BIT,
+ &map, &stride);
+
+ dstStride = _mesa_image_row_stride(packing, width,
+ GL_DEPTH_STENCIL_EXT, type);
+ dst = (GLubyte *) _mesa_image_address2d(packing, pixels,
+ width, height,
+ GL_DEPTH_STENCIL_EXT,
+ type, 0, 0);
+
+ for (i = 0; i < height; i++) {
+ _mesa_unpack_uint_24_8_depth_stencil_row(rb->Format, width,
+ map, (GLuint *)dst);
+ map += stride;
+ dst += dstStride;
+ }
+
+ ctx->Driver.UnmapRenderbuffer(ctx, rb);
+
+ return GL_TRUE;
+}
+
/**
* Read combined depth/stencil values.
@@ -390,40 +439,17 @@ read_depth_stencil_pixels(struct gl_context *ctx,
if (!depthRb || !stencilRb)
return;
- depthRb = ctx->ReadBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;
- stencilRb = ctx->ReadBuffer->Attachment[BUFFER_STENCIL].Renderbuffer;
-
- if (depthRb->_BaseFormat == GL_DEPTH_STENCIL_EXT &&
- depthRb->Format == MESA_FORMAT_Z24_S8 &&
- type == GL_UNSIGNED_INT_24_8 &&
- depthRb == stencilRb &&
- depthRb->GetRow && /* May be null if depthRb is a wrapper around
- * separate depth and stencil buffers. */
- !scaleOrBias &&
- !stencilTransfer) {
- /* This is the ideal case.
- * Reading GL_DEPTH_STENCIL pixels from combined depth/stencil buffer.
- * Plus, no pixel transfer ops to worry about!
- */
- GLint i;
- GLint dstStride = _mesa_image_row_stride(packing, width,
- GL_DEPTH_STENCIL_EXT, type);
- GLubyte *dst = (GLubyte *) _mesa_image_address2d(packing, pixels,
- width, height,
- GL_DEPTH_STENCIL_EXT,
- type, 0, 0);
- for (i = 0; i < height; i++) {
- depthRb->GetRow(ctx, depthRb, width, x, y + i, dst);
- dst += dstStride;
- }
+ if (!scaleOrBias && !stencilTransfer && !packing->SwapBytes) {
+ if (fast_read_depth_stencil_pixels(ctx, x, y, width, height, type,
+ pixels, packing))
+ return;
}
- else {
+
/* Reading GL_DEPTH_STENCIL pixels from separate depth/stencil buffers,
* or we need pixel transfer.
*/
+ {
GLint i;
- depthRb = ctx->ReadBuffer->_DepthBuffer;
- stencilRb = ctx->ReadBuffer->_StencilBuffer;
for (i = 0; i < height; i++) {
GLstencil stencilVals[MAX_WIDTH];