summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>2018-04-12 01:34:29 +0200
committerBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>2018-04-18 22:56:54 +0200
commitc48feaf2d185e247d016ef7d60eefac18f0e5704 (patch)
treec460cca44ab1d66ea6f59382330c4b759b0f4c79
parentb5e04e9217bad938970c41fd56edea9c9876825a (diff)
spirv: Add support for VK_EXT_descriptor_indexing uniform indexing caps.
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
-rw-r--r--src/compiler/shader_info.h1
-rw-r--r--src/compiler/spirv/spirv_to_nir.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h
index ababe520b2..6bbe526d2d 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 28274311c2..884f5b2c69 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");
}