From: Topi Pohjolainen <topi.pohjolainen@intel.com>
Date: Fri, 21 Jul 2017 08:49:08 +0000 (+0300)
Subject: main/teximage: Even on failure use valid format for init()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4aea4d6d64de81b2c00784aa69ca900fdbec3690;p=mesa.git

main/teximage: Even on failure use valid format for init()

Otherwise init_teximage_fields_ms() (called by
_mesa_init_teximage_fields()) will always assert as it can't
find valid base format.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 5e13025ed1b..2132aaee76b 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -5772,7 +5772,7 @@ texture_image_multisample(struct gl_context *ctx, GLuint dims,
              * like, but being tidy is good.
              */
             _mesa_init_teximage_fields(ctx, texImage,
-                  0, 0, 0, 0, GL_NONE, MESA_FORMAT_NONE);
+                  0, 0, 0, 0, internalformat, texFormat);
          }
       }