Mesa (master): tu: Fix descriptor update templates with input attachments

[GitLab Mirror]

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

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Mon Jul 27 13:17:42 2020 +0200

tu: Fix descriptor update templates with input attachments

Found via
dEQP-VK.binding_model.descriptorset_random.sets4.noarray.ubolimitlow.sbolimitlow.sampledimglow.outimgonly.noiub.nouab.frag.ialimitlow.0

Fixes: 159a1300ceb ("turnip: input attachment descriptor set rework")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6087>

---

 src/freedreno/vulkan/tu_descriptor_set.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/freedreno/vulkan/tu_descriptor_set.c b/src/freedreno/vulkan/tu_descriptor_set.c
index 060945ce4e9..1d2059ddc8b 100644
--- a/src/freedreno/vulkan/tu_descriptor_set.c
+++ b/src/freedreno/vulkan/tu_descriptor_set.c
@@ -1161,8 +1161,7 @@ tu_update_descriptor_set_with_template(
                                           buffer_list, *(VkBufferView *) src);
             break;
          case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
-         case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
-         case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: {
+         case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: {
             write_image_descriptor(device, cmd_buffer, ptr, buffer_list,
                                    templ->entry[i].descriptor_type,
                                    src);
@@ -1179,6 +1178,9 @@ tu_update_descriptor_set_with_template(
          case VK_DESCRIPTOR_TYPE_SAMPLER:
             write_sampler_descriptor(device, ptr, src);
             break;
+         case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
+            /* nothing in descriptor set - framebuffer state is used instead */
+            break;
          default:
             unreachable("unimplemented descriptor type");
             break;