From b89d0df5351eea1f26c6890dcdff7c0e38424ee1 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 15 Jul 2016 21:22:53 -0600 Subject: [PATCH] mesa: handle numSamples=0 in _mesa_test_proxy_teximage() Should fix the regressions reported in bug 96949. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96949 Reviewed-by: Kenneth Graunke --- src/mesa/main/teximage.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 10232d65658..d74a45fb815 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1271,8 +1271,6 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, { uint64_t bytes, mbytes; - assert(numSamples > 0); - if (numLevels > 0) { /* Compute total memory for a whole mipmap. This is the path * taken for glTexStorage(GL_PROXY_TEXTURE_x). @@ -1306,7 +1304,7 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, } bytes *= _mesa_num_tex_faces(target); - bytes *= numSamples; + bytes *= MAX2(1, numSamples); mbytes = bytes / (1024 * 1024); /* convert to MB */ -- 2.11.0