From: Brian Paul <brianp@vmware.com>
Date: Mon, 21 Aug 2017 19:08:41 +0000 (-0600)
Subject: svga: include sample count in surface_size() computation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5610911fed0f03962807ff9eb79d99eb005a5d71;p=mesa.git

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@vmware.com>
---

diff --git a/src/gallium/drivers/svga/svga_screen_cache.c b/src/gallium/drivers/svga/svga_screen_cache.c
index 5cec435830a..686d94aa50d 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;
 }