Mesa (master): mesa: allow GL_TEXTURE_CUBE_MAP_ARRAY case for glCompressedTexSubImage3D()

Brian Paul brianp at kemper.freedesktop.org
Wed Jul 22 00:40:17 UTC 2015


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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jul 21 18:35:38 2015 -0600

mesa: allow GL_TEXTURE_CUBE_MAP_ARRAY case for glCompressedTexSubImage3D()

Since s3tc works for cube maps and 2D arrays, it should also work for
cube arrays.  NVIDIA's driver supports this too.  Seems like the spec
should say this.

This is a minor follow-on fix for the commit "mesa: fix up some texture
error checks".

Reviewed-by: Roland Scheidegger <sroland at vmware.com>

---

 src/mesa/main/teximage.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 842b50d..6aa1bb4 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -4588,7 +4588,7 @@ compressed_subtexture_target_check(struct gl_context *ctx, GLenum target,
        * are valid here, which they are not, but of course not mentioned by
        * core spec.
        */
-      if (target != GL_TEXTURE_2D_ARRAY) {
+      if (target != GL_TEXTURE_2D_ARRAY && target != GL_TEXTURE_CUBE_MAP_ARRAY) {
          bool invalidformat;
          switch (format) {
             /* These came from _mesa_is_compressed_format in glformats.c. */




More information about the mesa-commit mailing list