From: Brian Paul <brianp@vmware.com>
Date: Mon, 17 Sep 2012 01:15:28 +0000 (-0600)
Subject: mesa: take cube faces into account in _mesa_test_proxy_teximage()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a0fc7620f5e8bdfcda07f920db560e5a17535e31;p=mesa.git

mesa: take cube faces into account in _mesa_test_proxy_teximage()

There will always be six cube faces so take that into consideration when
computing the texture size and comparing against the limit.
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index a0835d2ee0d..83e79a5a31c 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1372,6 +1372,7 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
     */
    uint64_t bytes = _mesa_format_image_size64(format, width, height, depth);
    uint64_t mbytes = bytes / (1024 * 1024); /* convert to MB */
+   mbytes *= _mesa_num_tex_faces(target);
    return mbytes <= (uint64_t) ctx->Const.MaxTextureMbytes;
 }