From: Daniel Borca <dborca@users.sourceforge.net>
Date: Mon, 20 Dec 2004 08:03:01 +0000 (+0000)
Subject: really protect against npot compressed textures (logbase2 never returns -1).
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2982dce27e242c89e4bc99979a878263df33ad2f;p=mesa.git

really protect against npot compressed textures (logbase2 never returns -1).
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index a98771311d2..55d75116792 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2724,16 +2724,16 @@ compressed_texture_error_check(GLcontext *ctx, GLint dimensions,
     * XXX We should probably use the proxy texture error check function here.
     */
    if (width < 1 || width > maxTextureSize ||
-       (!ctx->Extensions.ARB_texture_non_power_of_two && logbase2(width) < 0))
+       (!ctx->Extensions.ARB_texture_non_power_of_two && _mesa_bitcount(width) != 1))
       return GL_INVALID_VALUE;
 
    if ((height < 1 || height > maxTextureSize ||
-        (!ctx->Extensions.ARB_texture_non_power_of_two && logbase2(height) < 0))
+       (!ctx->Extensions.ARB_texture_non_power_of_two && _mesa_bitcount(height) != 1))
        && dimensions > 1)
       return GL_INVALID_VALUE;
 
    if ((depth < 1 || depth > maxTextureSize ||
-        (!ctx->Extensions.ARB_texture_non_power_of_two && logbase2(depth) < 0))
+       (!ctx->Extensions.ARB_texture_non_power_of_two && _mesa_bitcount(depth) != 1))
        && dimensions > 2)
       return GL_INVALID_VALUE;