Mesa (master): mesa: take cube faces into account in _mesa_test_proxy_teximage()

Brian Paul brianp at kemper.freedesktop.org
Tue Sep 18 02:01:12 UTC 2012


Module: Mesa
Branch: master
Commit: a0fc7620f5e8bdfcda07f920db560e5a17535e31
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0fc7620f5e8bdfcda07f920db560e5a17535e31

Author: Brian Paul <brianp at vmware.com>
Date:   Sun Sep 16 19:15:28 2012 -0600

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.

---

 src/mesa/main/teximage.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index a0835d2..83e79a5 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;
 }
 




More information about the mesa-commit mailing list