tu: Fix descriptor update templates with input attachments
authorConnor Abbott <cwabbott0@gmail.com>
Mon, 27 Jul 2020 11:17:42 +0000 (13:17 +0200)
committerMarge Bot <eric+marge@anholt.net>
Mon, 27 Jul 2020 12:36:36 +0000 (12:36 +0000)
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

index 060945ce4e936867419290c658d75ea71988dbf0..1d2059ddc8b32ec0b8d8ab71698322e32b942998 100644 (file)
@@ -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;