summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-12-03 15:21:36 -0700
committerBrian Paul <brianp@vmware.com>2010-12-03 15:26:31 -0700
commit5fc2548faea31acdd08bbb0f016ea41c6f01cf41 (patch)
treef5489f7bec979b02bdb591f5417742bc18dcab1b /src
parentb7acf538af24ddab72a5cbd5975f089a747b68e4 (diff)
swrast: accept GL_RG in glReadPixels()
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32088
Diffstat (limited to 'src')
-rw-r--r--src/mesa/swrast/s_readpix.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index 5e6356c0d5..91796788c1 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -495,27 +495,14 @@ _swrast_ReadPixels( struct gl_context *ctx,
read_depth_pixels(ctx, x, y, width, height, type, pixels,
&clippedPacking);
break;
- case GL_RED:
- case GL_GREEN:
- case GL_BLUE:
- case GL_ALPHA:
- case GL_RGB:
- case GL_LUMINANCE:
- case GL_LUMINANCE_ALPHA:
- case GL_RGBA:
- case GL_BGR:
- case GL_BGRA:
- case GL_ABGR_EXT:
- read_rgba_pixels(ctx, x, y, width, height,
- format, type, pixels, &clippedPacking);
- break;
case GL_DEPTH_STENCIL_EXT:
read_depth_stencil_pixels(ctx, x, y, width, height,
type, pixels, &clippedPacking);
break;
default:
- _mesa_problem(ctx, "unexpected format 0x%x in _swrast_ReadPixels", format);
- /* don't return yet, clean-up */
+ /* all other formats should be color formats */
+ read_rgba_pixels(ctx, x, y, width, height,
+ format, type, pixels, &clippedPacking);
}
swrast_render_finish(ctx);