Revert "mesa: set reasonable defaults in update_wrapper"

This reverts commit 1d5f16ff8f.

It breaks fbo-readpixels on swrast.
For some reason, swrast likes GL_RGBA and CHAN_TYPE.
This commit is contained in:
Marek Olšák 2011-05-14 04:38:36 +02:00
parent 1309d2ea72
commit 947190ab4b
1 changed files with 2 additions and 5 deletions

View File

@ -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;
}