From: Brian Paul <brianp@vmware.com>
Date: Sat, 16 Jul 2016 03:22:53 +0000 (-0600)
Subject: mesa: handle numSamples=0 in _mesa_test_proxy_teximage()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b89d0df5351eea1f26c6890dcdff7c0e38424ee1;p=mesa.git

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 <kenneth@whitecape.org>
---

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 */