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@vmware.com>
This commit is contained in:
Marek Olšák
2011-04-26 01:53:20 +02:00
parent 608a4a17fe
commit 1d5f16ff8f

View File

@@ -530,6 +530,7 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
{ {
struct texture_renderbuffer *trb struct texture_renderbuffer *trb
= (struct texture_renderbuffer *) att->Renderbuffer; = (struct texture_renderbuffer *) att->Renderbuffer;
GLuint unused;
(void) ctx; (void) ctx;
ASSERT(trb); ASSERT(trb);
@@ -602,8 +603,10 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
trb->Base._BaseFormat = GL_RGBA; trb->Base._BaseFormat = GL_RGBA;
break; break;
default: default:
trb->Base.DataType = CHAN_TYPE; _mesa_format_to_type_and_comps(trb->TexImage->TexFormat,
trb->Base._BaseFormat = GL_RGBA; &trb->Base.DataType, &unused);
trb->Base._BaseFormat =
_mesa_base_fbo_format(ctx, trb->TexImage->InternalFormat);
} }
trb->Base.Data = trb->TexImage->Data; trb->Base.Data = trb->TexImage->Data;
} }