From: Ian Romanick <idr@us.ibm.com>
Date: Fri, 8 Oct 2004 01:03:10 +0000 (+0000)
Subject: Reject unsupported texture formats passed to glCompressedTexImage?D.  This
X-Git-Tag: android-x86-1.6~6494
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a2dc424acfe83f3c66d3509f5a1efc24ce884367;p=android-x86%2Fexternal-mesa.git

Reject unsupported texture formats passed to glCompressedTexImage?D.  This
fixes Mesa bug #1028405.
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 8f27af970c4..3ef3d6442ef 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2798,6 +2798,9 @@ compressed_texture_error_check(GLcontext *ctx, GLint dimensions,
    if (!is_compressed_format(ctx, internalFormat))
       return GL_INVALID_ENUM;
 
+   if (_mesa_base_tex_format(ctx, internalFormat) < 0)
+      return GL_INVALID_ENUM;
+
    if (border != 0)
       return GL_INVALID_VALUE;