From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Fri, 6 Apr 2018 14:02:16 +0000 (+0200)
Subject: radv: simplify a check in radv_initialise_color_surface()
X-Git-Tag: android-x86-8.1-r1~4195
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2692736cee84931ca9b50faaa02529f4b78fe312;p=android-x86%2Fexternal-mesa.git

radv: simplify a check in radv_initialise_color_surface()

If the image has FMASK metadata, the number of samples is > 1
because radv_image_can_enable_fmask() handles that already.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 846639eab0d..39e320e3771 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -3548,7 +3548,7 @@ radv_initialise_color_surface(struct radv_device *device,
 				    format != V_028C70_COLOR_24_8) |
 		S_028C70_NUMBER_TYPE(ntype) |
 		S_028C70_ENDIAN(endian);
-	if ((iview->image->info.samples > 1) && radv_image_has_fmask(iview->image)) {
+	if (radv_image_has_fmask(iview->image)) {
 		cb->cb_color_info |= S_028C70_COMPRESSION(1);
 		if (device->physical_device->rad_info.chip_class == SI) {
 			unsigned fmask_bankh = util_logbase2(iview->image->fmask.bank_height);