Mesa (master): mesa: Fix condition for using compressed internalformat in glCompressedTexImage3D ()
Anuj Phogat
aphogat at kemper.freedesktop.org
Tue Aug 5 01:32:10 UTC 2014
Module: Mesa
Branch: master
Commit: 3c7a0c690a1a0d72ad2b911e4a209447ce3edc1f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3c7a0c690a1a0d72ad2b911e4a209447ce3edc1f
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Fri May 30 17:48:34 2014 -0700
mesa: Fix condition for using compressed internalformat in glCompressedTexImage3D()
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
---
src/mesa/main/teximage.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index b6c3e85..21ba4b6 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2299,7 +2299,14 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
if (!_mesa_target_can_be_compressed(ctx, target, internalFormat)) {
reason = "target";
- error = GL_INVALID_ENUM;
+ /* From section 3.8.6, page 146 of OpenGL ES 3.0 spec:
+ *
+ * "The ETC2/EAC texture compression algorithm supports only
+ * two-dimensional images. If internalformat is an ETC2/EAC format,
+ * CompressedTexImage3D will generate an INVALID_OPERATION error if
+ * target is not TEXTURE_2D_ARRAY."
+ */
+ error = _mesa_is_desktop_gl(ctx) ? GL_INVALID_ENUM : GL_INVALID_OPERATION;
goto error;
}
More information about the mesa-commit
mailing list