Mesa (8.0): meta: Add GL_RED/GL_RG support to meta CopyTexImage.

[Eric Anholt]

Module: Mesa
Branch: 8.0
Commit: 89fdeab1a201ae41b13693261fdc1aca6dbf79f7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=89fdeab1a201ae41b13693261fdc1aca6dbf79f7

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jan  9 16:41:02 2012 -0800

meta: Add GL_RED/GL_RG support to meta CopyTexImage.

Fixes some _mesa_problem()s in oglconform.

Reviewed-by: Brian Paul <brianp at vmware.com>
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit f83756f80f509fc51030853f8aa0fef3309fe886)

---

 src/mesa/drivers/common/meta.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index abf2f1f..dca3613 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -3071,6 +3071,8 @@ get_temp_image_type(struct gl_context *ctx, GLenum baseFormat)
    switch (baseFormat) {
    case GL_RGBA:
    case GL_RGB:
+   case GL_RG:
+   case GL_RED:
    case GL_ALPHA:
    case GL_LUMINANCE:
    case GL_LUMINANCE_ALPHA:
@@ -3086,7 +3088,8 @@ get_temp_image_type(struct gl_context *ctx, GLenum baseFormat)
    case GL_DEPTH_STENCIL:
       return GL_UNSIGNED_INT_24_8;
    default:
-      _mesa_problem(ctx, "Unexpected format in get_temp_image_type()");
+      _mesa_problem(ctx, "Unexpected format %d in get_temp_image_type()",
+		    baseFormat);
       return 0;
    }
 }