Mesa (7.10): st/mesa: remove asserts in st_texture_image_copy

Marek Olšák mareko at kemper.freedesktop.org
Sat Jun 11 20:36:22 UTC 2011


Module: Mesa
Branch: 7.10
Commit: b9f2eefd1de2be1f5959aa2876d7a286841ce219
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9f2eefd1de2be1f5959aa2876d7a286841ce219

Author: Marek Olšák <maraeo at gmail.com>
Date:   Fri Jun 10 19:29:05 2011 +0200

st/mesa: remove asserts in st_texture_image_copy

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

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 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;




More information about the mesa-commit mailing list