Mesa (master): svga: include sample count in surface_size() computation

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Aug 21 13:08:41 2017 -0600

svga: include sample count in surface_size() computation

Use MAX2() because sampleCount will be zero for non-MSAA surfaces.
No Piglit regressions.

Reviewed-by: Charmaine Lee <charmainel at vmware.com>

---

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

diff --git a/src/gallium/drivers/svga/svga_screen_cache.c b/src/gallium/drivers/svga/svga_screen_cache.c
index 5cec435830..686d94aa50 100644
--- a/src/gallium/drivers/svga/svga_screen_cache.c
+++ b/src/gallium/drivers/svga/svga_screen_cache.c
@@ -69,7 +69,7 @@ surface_size(const struct svga_host_surface_cache_key *key)
       total_size += img_size;
    }
 
-   total_size *= key->numFaces * key->arraySize;
+   total_size *= key->numFaces * key->arraySize * MAX2(1, key->sampleCount);
 
    return total_size;
 }