Mesa (mesa_7_7_branch): radeon: workaround an FBO issue

[Maciej Cencora]

Module: Mesa
Branch: mesa_7_7_branch
Commit: 6c41bb25a2e260dbce2c2d72ec64d1beb74527de
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c41bb25a2e260dbce2c2d72ec64d1beb74527de

Author: Maciej Cencora <m.cencora at gmail.com>
Date:   Thu Dec  3 20:21:16 2009 +0100

radeon: workaround an FBO issue

Fixes #21501

---

 src/mesa/drivers/dri/radeon/radeon_fbo.c         |    6 ++++++
 src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c |    3 +++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c b/src/mesa/drivers/dri/radeon/radeon_fbo.c
index 7ec641f..fc21069 100644
--- a/src/mesa/drivers/dri/radeon/radeon_fbo.c
+++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c
@@ -369,6 +369,12 @@ radeon_framebuffer_renderbuffer(GLcontext * ctx,
 }
 
 
+/* TODO: According to EXT_fbo spec internal format of texture image
+ * once set during glTexImage call, should be preserved when
+ * attaching image to renderbuffer. When HW doesn't support
+ * rendering to format of attached image, set framebuffer
+ * completeness accordingly in radeon_validate_framebuffer (issue #79).
+ */
 static GLboolean
 radeon_update_wrapper(GLcontext *ctx, struct radeon_renderbuffer *rrb, 
 		     struct gl_texture_image *texImage)
diff --git a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
index a9d601a..0415a50 100644
--- a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
+++ b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
@@ -421,9 +421,12 @@ static void migrate_image_to_miptree(radeon_mipmap_tree *mt,
 
 		radeon_mipmap_level *srclvl = &image->mt->levels[image->mtlevel];
 
+		/* TODO: bring back these assertions once the FBOs are fixed */
+#if 0
 		assert(image->mtlevel == level);
 		assert(srclvl->size == dstlvl->size);
 		assert(srclvl->rowstride == dstlvl->rowstride);
+#endif
 
 		radeon_bo_map(image->mt->bo, GL_FALSE);