Mesa (master): mesa: set reasonable defaults in update_wrapper

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 1d5f16ff8fae936f2e920800b169cf7736a8052a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d5f16ff8fae936f2e920800b169cf7736a8052a

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Apr 26 01:53:20 2011 +0200

mesa: set reasonable defaults in update_wrapper

I was wondering why I had been getting GL_RGBA for GL_RGB9_E5.

Instead of setting GL_RGBA and CHAN_TYPE for most types,
use the helper functions to obtain the info.

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/main/texrender.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index a7641a5..8ba78b8 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -530,6 +530,7 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
 {
    struct texture_renderbuffer *trb
       = (struct texture_renderbuffer *) att->Renderbuffer;
+   GLuint unused;
 
    (void) ctx;
    ASSERT(trb);
@@ -602,8 +603,10 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
       trb->Base._BaseFormat = GL_RGBA;
       break;
    default:
-      trb->Base.DataType = CHAN_TYPE;
-      trb->Base._BaseFormat = GL_RGBA;
+      _mesa_format_to_type_and_comps(trb->TexImage->TexFormat,
+                                     &trb->Base.DataType, &unused);
+      trb->Base._BaseFormat =
+         _mesa_base_fbo_format(ctx, trb->TexImage->InternalFormat);
    }
    trb->Base.Data = trb->TexImage->Data;
 }