diff options
| author | Brian Paul <brianp@vmware.com> | 2016-07-15 21:22:53 -0600 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2016-07-15 21:32:24 -0700 |
| commit | b89d0df5351eea1f26c6890dcdff7c0e38424ee1 (patch) | |
| tree | f0f17d8439e559ef0188a351af48100a99d934c8 /src/mesa/main/teximage.c | |
| parent | aa6f60f844f3834fd89d35d8bfe6aa88a288d4fe (diff) | |
| download | external_mesa3d-b89d0df5351eea1f26c6890dcdff7c0e38424ee1.zip external_mesa3d-b89d0df5351eea1f26c6890dcdff7c0e38424ee1.tar.gz external_mesa3d-b89d0df5351eea1f26c6890dcdff7c0e38424ee1.tar.bz2 | |
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>
Diffstat (limited to 'src/mesa/main/teximage.c')
| -rw-r--r-- | src/mesa/main/teximage.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 10232d6..d74a45f 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 */ |