From 5fc2548faea31acdd08bbb0f016ea41c6f01cf41 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 3 Dec 2010 15:21:36 -0700 Subject: swrast: accept GL_RG in glReadPixels() Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32088 --- src/mesa/swrast/s_readpix.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'src/mesa/swrast') 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); -- cgit v1.2.3