Mesa (master): teximage: ensure that Tex*SubImage* checks format

[GitLab Mirror]

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

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Mon Sep  2 18:50:01 2019 -0400

teximage: ensure that Tex*SubImage* checks format

We were previously not doing at least some of the checks. This uses the
same logic that is used in glTexImage*.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/main/teximage.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index f90765f40fa..e55e435779f 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2205,6 +2205,15 @@ texsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
       return GL_TRUE;
    }
 
+   if (!texture_formats_agree(texImage->InternalFormat, format)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "%s(incompatible internalFormat = %s, format = %s)",
+                  callerName,
+                  _mesa_enum_to_string(texImage->InternalFormat),
+                  _mesa_enum_to_string(format));
+      return GL_TRUE;
+   }
+
    GLenum internalFormat = _mesa_is_gles(ctx) ?
       oes_float_internal_format(ctx, texImage->InternalFormat, type) :
       texImage->InternalFormat;