From: Dave Airlie <airlied@redhat.com>
Date: Tue, 1 Mar 2011 23:48:40 +0000 (+1000)
Subject: rgtc: fixup mipmap generation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8eebd216dd9f32de65e9af4160c042825ca75466;p=mesa.git

rgtc: fixup mipmap generation

this allows swrast to pass mipmap generation for these formats.
---

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index d8a56103800..0727e1818f1 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1755,8 +1755,13 @@ _mesa_generate_mipmap(struct gl_context *ctx, GLenum target,
       if (srcImage->_BaseFormat == GL_RGB) {
          convertFormat = MESA_FORMAT_RGB888;
          components = 3;
-      }
-      else if (srcImage->_BaseFormat == GL_RGBA) {
+      } else if (srcImage->_BaseFormat == GL_RED) {
+         convertFormat = MESA_FORMAT_R8;
+         components = 1;
+      } else if (srcImage->_BaseFormat == GL_RG) {
+         convertFormat = MESA_FORMAT_RG88;
+         components = 2;
+      } else if (srcImage->_BaseFormat == GL_RGBA) {
          convertFormat = MESA_FORMAT_RGBA8888;
          components = 4;
       }