diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-30 16:21:56 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-30 16:21:56 +0000 |
| commit | e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f (patch) | |
| tree | 1804d7456ba8f200c7e329d4e6aa67ce4fb1649f /mesalib/src/mesa/main/texrender.c | |
| parent | 88a78ebea08af461224f815a8380ea5c54186f43 (diff) | |
| parent | 0402d388cb9803652c0f9a52ba7dcb6029fdd0b9 (diff) | |
| download | vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.tar.gz vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.tar.bz2 vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/texrender.c')
| -rw-r--r-- | mesalib/src/mesa/main/texrender.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/texrender.c b/mesalib/src/mesa/main/texrender.c index 2766bd6c5..4bcef9899 100644 --- a/mesalib/src/mesa/main/texrender.c +++ b/mesalib/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;
}
|