Mesa (master): radv: set fmask_surf_index on fmask surfaces.

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue May  1 12:32:02 2018 +1000

radv: set fmask_surf_index on fmask surfaces.

This is needed for gfx9 and later for all fmask surface index.

(Mentioned by Marek on irc)

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

---

 src/amd/vulkan/radv_image.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index a6f3628c8f..bfe497caa3 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -742,8 +742,10 @@ radv_image_get_fmask_info(struct radv_device *device,
 	info.samples = 1;
 	fmask.flags = image->surface.flags | RADEON_SURF_FMASK;
 
-	if (!image->shareable)
+	if (!image->shareable) {
+		info.fmask_surf_index = &device->fmask_mrt_offset_counter;
 		info.surf_index = &device->fmask_mrt_offset_counter;
+	}
 
 	/* Force 2D tiling if it wasn't set. This may occur when creating
 	 * FMASK for MSAA resolve on R6xx. On R6xx, the single-sample