From e477d92c94d6415d2844f68766adf5339aebe7bf Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 13 Jul 2016 13:52:31 -0600 Subject: [PATCH] mesa: use _mesa_clear_texture_image() in clear_texture_fields() This avoids a failed assert(img->_BaseFormat != -1) in init_teximage_fields_ms() because the internalFormat argument is GL_NONE. This was hit when using glTexStorage() to do a proxy texture test. Fixes a failure with the updated Piglit tex3d-maxsize test. Cc: Reviewed-by: Anuj Phogat --- src/mesa/main/texstorage.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c index f4a076028fb..72ed8696fde 100644 --- a/src/mesa/main/texstorage.c +++ b/src/mesa/main/texstorage.c @@ -179,9 +179,7 @@ clear_texture_fields(struct gl_context *ctx, return; } - _mesa_init_teximage_fields(ctx, texImage, - 0, 0, 0, 0, /* w, h, d, border */ - GL_NONE, MESA_FORMAT_NONE); + _mesa_clear_texture_image(ctx, texImage); } } } -- 2.30.2