radv: Don't allow fmask swizzling for shareable images.
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Mon, 7 Aug 2017 21:34:00 +0000 (23:34 +0200)
committerBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Mon, 7 Aug 2017 21:44:59 +0000 (23:44 +0200)
Also adds an assert because you never know how the winsys changes, and
multiprocess format differences are annoying.

Fixes: 1e696b962b7 "radv: add separate fmask tile swizzle counter."
Reviewed-by: Dave Airlie <airlied@redhat.com>
src/amd/vulkan/radv_image.c

index 1ccd4a463f077b627bc9fb460b6a05657c8e98cd..7e59142bf30123d81a7b1cb6fdf40af0a32efe01 100644 (file)
@@ -616,7 +616,8 @@ radv_image_get_fmask_info(struct radv_device *device,
        info.samples = 1;
        fmask.flags = image->surface.flags | RADEON_SURF_FMASK;
 
-       info.surf_index = &device->fmask_mrt_offset_counter;
+       if (!image->shareable);
+               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
@@ -649,6 +650,8 @@ radv_image_get_fmask_info(struct radv_device *device,
        out->tile_swizzle = fmask.tile_swizzle;
        out->alignment = MAX2(256, fmask.surf_alignment);
        out->size = fmask.surf_size;
+
+       assert(!out->tile_swizzle || !image->shareable);
 }
 
 static void