On 06/10/2011 11:44 AM, Marek Olšák wrote:
This is for 7.10 only. The fix in master looks too complex to be
cherry-picked.

The assertions fail when generating mipmaps for NPOT textures.

This fixes:
- fbo-generatemipmap-formats (all of them)
---
  src/mesa/state_tracker/st_texture.c |    4 ----
  1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/mesa/state_tracker/st_texture.c 
b/src/mesa/state_tracker/st_texture.c
index 155ea39..4a794f6 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -285,10 +285,6 @@ st_texture_image_copy(struct pipe_context *pipe,
     struct pipe_box src_box;
     GLuint i;

-   assert(u_minify(src->width0, srcLevel) == width);
-   assert(u_minify(src->height0, srcLevel) == height);
-   assert(u_minify(src->depth0, srcLevel) == depth);
-
     src_box.x = 0;
     src_box.y = 0;
     src_box.width = width;

Reviewed-by: Brian Paul <bri...@vmware.com>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to