From: Brian Paul <brianp@vmware.com>
Date: Fri, 3 Dec 2010 22:21:36 +0000 (-0700)
Subject: swrast: accept GL_RG in glReadPixels()
X-Git-Tag: mesa-7.10~231
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fc2548faea31acdd08bbb0f016ea41c6f01cf41;p=platform%2Fupstream%2Fmesa.git

swrast: accept GL_RG in glReadPixels()

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32088
---

diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index 5e6356c..9179678 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);