radv/gfx9: set descriptor up for base_mip to level range.
authorDave Airlie <airlied@redhat.com>
Mon, 21 Aug 2017 20:08:10 +0000 (21:08 +0100)
committerDave Airlie <airlied@redhat.com>
Wed, 6 Sep 2017 02:22:22 +0000 (03:22 +0100)
This is required on GFX9, fixes a bug in Talos where all the
mipmaps overlay each other.

Just pushing this as well as it fixes Talos.

Cc: "17.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
src/amd/vulkan/radv_image.c

index 06b9c2f9d37f8b6734431d527bc7bf96b11edfeb..9c5767262e16ebaea61aab00d51b33252ff27b63 100644 (file)
@@ -876,6 +876,7 @@ radv_image_view_make_descriptor(struct radv_image_view *iview,
        uint32_t blk_w;
        uint32_t *descriptor;
        uint32_t *fmask_descriptor;
+       uint32_t hw_level = 0;
 
        if (is_storage_image) {
                descriptor = iview->storage_descriptor;
@@ -888,11 +889,13 @@ radv_image_view_make_descriptor(struct radv_image_view *iview,
        assert(image->surface.blk_w % vk_format_get_blockwidth(image->vk_format) == 0);
        blk_w = image->surface.blk_w / vk_format_get_blockwidth(image->vk_format) * vk_format_get_blockwidth(iview->vk_format);
 
+       if (device->physical_device->rad_info.chip_class >= GFX9)
+               hw_level = iview->base_mip;
        si_make_texture_descriptor(device, image, is_storage_image,
                                   iview->type,
                                   iview->vk_format,
                                   components,
-                                  0, iview->level_count - 1,
+                                  hw_level, hw_level + iview->level_count - 1,
                                   iview->base_layer,
                                   iview->base_layer + iview->layer_count - 1,
                                   iview->extent.width,