Mesa (master): radeon: fix glCopyTex(Sub)Image
Maciej Cencora
osiris at kemper.freedesktop.org
Sat Mar 13 16:35:25 UTC 2010
Module: Mesa
Branch: master
Commit: 1a8a230a61289392e8300901dfabd7911799cbc3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a8a230a61289392e8300901dfabd7911799cbc3
Author: Maciej Cencora <m.cencora at gmail.com>
Date: Sat Mar 13 16:46:19 2010 +0100
radeon: fix glCopyTex(Sub)Image
Fallback to swrast for software renderbuffers
---
src/mesa/drivers/dri/radeon/radeon_tex_copy.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/radeon/radeon_tex_copy.c b/src/mesa/drivers/dri/radeon/radeon_tex_copy.c
index e57d77e..fb6f2e5 100644
--- a/src/mesa/drivers/dri/radeon/radeon_tex_copy.c
+++ b/src/mesa/drivers/dri/radeon/radeon_tex_copy.c
@@ -59,18 +59,27 @@ do_copy_texsubimage(GLcontext *ctx,
}
if (_mesa_get_format_bits(timg->base.TexFormat, GL_DEPTH_BITS) > 0) {
- rrb = radeon_renderbuffer(ctx->ReadBuffer->_DepthBuffer);
+ if (ctx->ReadBuffer->_DepthBuffer && ctx->ReadBuffer->_DepthBuffer->Wrapped) {
+ rrb = radeon_renderbuffer(ctx->ReadBuffer->_DepthBuffer->Wrapped);
+ } else {
+ rrb = radeon_renderbuffer(ctx->ReadBuffer->_DepthBuffer);
+ }
flip_y = ctx->ReadBuffer->Attachment[BUFFER_DEPTH].Type == GL_NONE;
} else {
rrb = radeon_renderbuffer(ctx->ReadBuffer->_ColorReadBuffer);
flip_y = ctx->ReadBuffer->Attachment[BUFFER_COLOR0].Type == GL_NONE;
}
+ // This is software renderbuffer, fallback to swrast
+ if (!rrb) {
+ return GL_FALSE;
+ }
+
if (!timg->mt) {
radeon_validate_texture_miptree(ctx, &tobj->base);
}
- assert(rrb && rrb->bo);
+ assert(rrb->bo);
assert(timg->mt);
assert(timg->mt->bo);
assert(timg->base.Width >= dstx + width);
More information about the mesa-commit
mailing list