From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Wed, 11 Apr 2018 23:34:29 +0000 (+0200)
Subject: spirv: Add support for VK_EXT_descriptor_indexing uniform indexing caps.
X-Git-Tag: upstream/18.1.0~69
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c48feaf2d185e247d016ef7d60eefac18f0e5704;p=platform%2Fupstream%2Fmesa.git

spirv: Add support for VK_EXT_descriptor_indexing uniform indexing caps.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
---

diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h
index ababe52..6bbe526 100644
--- a/src/compiler/shader_info.h
+++ b/src/compiler/shader_info.h
@@ -53,6 +53,7 @@ struct spirv_supported_capabilities {
    bool subgroup_vote;
    bool gcn_shader;
    bool trinary_minmax;
+   bool descriptor_array_dynamic_indexing;
 };
 
 typedef struct shader_info {
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 2827431..884f5b2 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -3384,6 +3384,12 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
          spv_check_supported(shader_viewport_index_layer, cap);
          break;
 
+      case SpvCapabilityInputAttachmentArrayDynamicIndexingEXT:
+      case SpvCapabilityUniformTexelBufferArrayDynamicIndexingEXT:
+      case SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT:
+         spv_check_supported(descriptor_array_dynamic_indexing, cap);
+         break;
+
       default:
          vtn_fail("Unhandled capability");
       }