From: Eric Anholt <eric@anholt.net>
Date: Fri, 30 Mar 2018 23:14:29 +0000 (-0700)
Subject: broadcom/vc5: Fix MSAA depth/stencil size setup.
X-Git-Tag: upstream/18.1.0~230
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7553cbfc9d78f0a4f8816122ce6327bc3899c2b5;p=platform%2Fupstream%2Fmesa.git

broadcom/vc5: Fix MSAA depth/stencil size setup.

The v3dX(get_internal_type_bpp_for_output_format)() call only handles
color output formats (which overlap in enum numbers with depth output
formats), so for depth we just need to take the normal cpp times the
number of samples.
---

diff --git a/src/gallium/drivers/vc5/vc5_resource.c b/src/gallium/drivers/vc5/vc5_resource.c
index 321a14b..c8c99cf 100644
--- a/src/gallium/drivers/vc5/vc5_resource.c
+++ b/src/gallium/drivers/vc5/vc5_resource.c
@@ -565,8 +565,10 @@ vc5_resource_setup(struct pipe_screen *pscreen,
         pipe_reference_init(&prsc->reference, 1);
         prsc->screen = pscreen;
 
-        if (prsc->nr_samples <= 1) {
-                rsc->cpp = util_format_get_blocksize(prsc->format);
+        if (prsc->nr_samples <= 1 ||
+            util_format_is_depth_or_stencil(prsc->format)) {
+                rsc->cpp = util_format_get_blocksize(prsc->format) *
+                        MAX2(prsc->nr_samples, 1);
         } else {
                 assert(vc5_rt_format_supported(&screen->devinfo, prsc->format));
                 uint32_t output_image_format =