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

Author: Topi Pohjolainen <[email protected]>
Date:   Fri Jul 21 11:49:08 2017 +0300

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 <[email protected]>
Signed-off-by: Topi Pohjolainen <[email protected]>

---

 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 5e13025ed1..2132aaee76 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);
          }
       }
 

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to