From: Brian Paul <brianp@vmware.com>
Date: Wed, 13 Jul 2016 19:52:31 +0000 (-0600)
Subject: mesa: use _mesa_clear_texture_image() in clear_texture_fields()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e477d92c94d6415d2844f68766adf5339aebe7bf;p=mesa.git

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: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
---

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);
       }
    }
 }