fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 19:40:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa: Don't disable fast path for normalized types

Browse source 
Mesa has a fast path for the generic fallback when using glReadPixels
for RGBA data which uses memcpy.  However it was really difficult to
hit this case because it would not be used if any transferOps are
enabled.  Any type apart from floating point or non-normalized integer
types (so any of the common types) would force enabling clamping so
the fast path could not be used.  This patch makes it ignore clamping
when determining whether to use the fast path if the data type of the
buffer is an unsigned normalized type because in that case clamping
will not have any effect anyway.

https://bugs.freedesktop.org/show_bug.cgi?id=46631

NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit d9c4209777)
This commit is contained in:
Neil Roberts 2012-02-26 01:33:40 +00:00 • committed by Brian Paul
parent a30809878f
commit 9664fb70dc
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/mesa/main/readpix.c
View file

@ -218,6 +218,16 @@ fast_read_rgba_pixels_memcpy( struct gl_context *ctx,
return GL_FALSE;
}
/* If the format is unsigned normalized then we can ignore clamping
* because the values are already in the range [0,1] so it won't
* have any effect anyway.
*/
if (_mesa_get_format_datatype(rb->Format) == GL_UNSIGNED_NORMALIZED)
transferOps &= ~IMAGE_CLAMP_BIT;
if (transferOps)
return GL_FALSE;
dstStride = _mesa_image_row_stride(packing, width, format, type);
dst = (GLubyte *) _mesa_image_address2d(packing, pixels, width, height,
format, type, 0, 0);
@ -313,13 +323,11 @@ read_rgba_pixels( struct gl_context *ctx,
transferOps |= IMAGE_CLAMP_BIT;
}
if (!transferOps) {
/* Try the optimized paths first. */
if (fast_read_rgba_pixels_memcpy(ctx, x, y, width, height,
format, type, pixels, packing,
transferOps)) {
return;
}
/* Try the optimized paths first. */
if (fast_read_rgba_pixels_memcpy(ctx, x, y, width, height,
format, type, pixels, packing,
transferOps)) {
return;
}
slow_read_rgba_pixels(ctx, x, y, width, height,