diff options
| author | Marek Olšák <[email protected]> | 2011-05-14 04:38:36 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-05-17 00:13:43 +0200 |
| commit | 947190ab4bbc8ea99bda3c464013af2a87c3286d (patch) | |
| tree | e40e880d9f20cdcd23684d01c8853d92661d4fc0 /src/mesa | |
| parent | 1309d2ea723613f1e755dd7785d22456dd39bb08 (diff) | |
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.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/texrender.c | 7 |
1 files 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; } |