From 947190ab4bbc8ea99bda3c464013af2a87c3286d Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sat, 14 May 2011 04:38:36 +0200 Subject: Revert "mesa: set reasonable defaults in update_wrapper" This reverts commit 1d5f16ff8fae936f2e920800b169cf7736a8052a. It breaks fbo-readpixels on swrast. For some reason, swrast likes GL_RGBA and CHAN_TYPE. --- src/mesa/main/texrender.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c index 8ba78b8b477..a7641a5f9a4 100644 --- a/src/mesa/main/texrender.c +++ b/src/mesa/main/texrender.c @@ -530,7 +530,6 @@ 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); @@ -603,10 +602,8 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att) trb->Base._BaseFormat = GL_RGBA; break; default: - _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.DataType = CHAN_TYPE; + trb->Base._BaseFormat = GL_RGBA; } trb->Base.Data = trb->TexImage->Data; } -- cgit v1.2.3