Mesa (master): st/mesa: remove bogus assertions st_CompressedTexSubImage2D

Roland Scheidegger sroland at kemper.freedesktop.org
Tue Jun 22 05:33:30 PDT 2010


Module: Mesa
Branch: master
Commit: 583f241716639ae7fc24eca38418d5860de229cb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=583f241716639ae7fc24eca38418d5860de229cb

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Tue Jun 22 13:32:25 2010 +0100

st/mesa: remove bogus assertions st_CompressedTexSubImage2D

width/height may not be a multiple of blocksize (small mip levels / npot
textures). This should be handled just fine.
Fixes #28530.

---

 src/mesa/state_tracker/st_cb_texture.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 2101b9b..8f7ebee 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1242,8 +1242,6 @@ st_CompressedTexSubImage2D(GLcontext *ctx, GLenum target, GLint level,
 
    assert(xoffset % util_format_get_blockwidth(pformat) == 0);
    assert(yoffset % util_format_get_blockheight(pformat) == 0);
-   assert(width % util_format_get_blockwidth(pformat) == 0);
-   assert(height % util_format_get_blockheight(pformat) == 0);
 
    for (y = 0; y < height; y += util_format_get_blockheight(pformat)) {
       /* don't need to adjust for xoffset and yoffset as st_texture_image_map does that */



More information about the mesa-commit mailing list