Mesa (master): radv: Fix hang width YCBCR array textures.

[GitLab Mirror]

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

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Mon Apr 29 21:34:28 2019 +0200

radv: Fix hang width YCBCR array textures.

Forgot to apply the width/height divisor for CB writes resulting in
the CB using larger than expected slice sizes.

Fixes: 42d159f2766 "radv: Add multiple planes to images."
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110530
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110526
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

---

 src/amd/vulkan/radv_device.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 039682cb384..10956ded66f 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -4380,14 +4380,18 @@ radv_initialise_color_surface(struct radv_device *device,
 	}
 
 	if (device->physical_device->rad_info.chip_class >= GFX9) {
+		const struct vk_format_description *format_desc = vk_format_description(iview->image->vk_format);
+
 		unsigned mip0_depth = iview->image->type == VK_IMAGE_TYPE_3D ?
 		  (iview->extent.depth - 1) : (iview->image->info.array_size - 1);
+		unsigned width = iview->extent.width / (iview->plane_id ? format_desc->width_divisor : 1);
+		unsigned height = iview->extent.height / (iview->plane_id ? format_desc->height_divisor : 1);
 
 		cb->cb_color_view |= S_028C6C_MIP_LEVEL(iview->base_mip);
 		cb->cb_color_attrib |= S_028C74_MIP0_DEPTH(mip0_depth) |
 			S_028C74_RESOURCE_TYPE(surf->u.gfx9.resource_type);
-		cb->cb_color_attrib2 = S_028C68_MIP0_WIDTH(iview->extent.width - 1) |
-			S_028C68_MIP0_HEIGHT(iview->extent.height - 1) |
+		cb->cb_color_attrib2 = S_028C68_MIP0_WIDTH(width - 1) |
+			S_028C68_MIP0_HEIGHT(height - 1) |
 			S_028C68_MAX_MIP(iview->image->info.levels - 1);
 	}
 }