summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texstorage.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2016-07-13 13:52:31 -0600
committerBrian Paul <brianp@vmware.com>2016-07-15 14:24:34 -0600
commite477d92c94d6415d2844f68766adf5339aebe7bf (patch)
tree18723ec9a87ff2c2ffaeaeab4edef9ce660288ba /src/mesa/main/texstorage.c
parent6b7923ee46eca7b98a36992f77fea362b469a1d9 (diff)
downloadexternal_mesa3d-e477d92c94d6415d2844f68766adf5339aebe7bf.zip
external_mesa3d-e477d92c94d6415d2844f68766adf5339aebe7bf.tar.gz
external_mesa3d-e477d92c94d6415d2844f68766adf5339aebe7bf.tar.bz2
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>
Diffstat (limited to 'src/mesa/main/texstorage.c')
-rw-r--r--src/mesa/main/texstorage.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c
index f4a0760..72ed869 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);
}
}
}