Mesa (master): svga: fixed surface size to include array size

[Brian Paul]

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

Author: Charmaine Lee <charmainel at vmware.com>
Date:   Tue Jun  6 11:52:50 2017 -0700

svga: fixed surface size to include array size

This patch fixes the total surface size in surface cache
to include array size as well.

Tested with MTT glretrace.

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/drivers/svga/svga_screen_cache.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/svga/svga_screen_cache.c b/src/gallium/drivers/svga/svga_screen_cache.c
index 0816ff68c8..5cec435830 100644
--- a/src/gallium/drivers/svga/svga_screen_cache.c
+++ b/src/gallium/drivers/svga/svga_screen_cache.c
@@ -48,6 +48,7 @@ surface_size(const struct svga_host_surface_cache_key *key)
 
    assert(key->numMipLevels > 0);
    assert(key->numFaces > 0);
+   assert(key->arraySize > 0);
 
    if (key->format == SVGA3D_BUFFER) {
       /* Special case: we don't want to count vertex/index buffers
@@ -68,7 +69,7 @@ surface_size(const struct svga_host_surface_cache_key *key)
       total_size += img_size;
    }
 
-   total_size *= key->numFaces;
+   total_size *= key->numFaces * key->arraySize;
 
    return total_size;
 }