aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2018-12-17 17:24:06 +0100
committerSamuel Pitoiset <[email protected]>2018-12-20 18:01:09 +0100
commitf45e43e156a9cdc0527f63bf0def15766a1c5199 (patch)
tree1f9922f8cf6286199f67d6865ac8d79ae32b928e
parent5b1ec10e4cf0b5ad3d21172333613f8f090a9a52 (diff)
spirv: add support for SpvCapabilityStorageImageMultisample
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]>
-rw-r--r--src/compiler/shader_info.h1
-rw-r--r--src/compiler/spirv/spirv_to_nir.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h
index b21db3e60f0..05f37c8d197 100644
--- a/src/compiler/shader_info.h
+++ b/src/compiler/shader_info.h
@@ -64,6 +64,7 @@ struct spirv_supported_capabilities {
bool transform_feedback;
bool geometry_streams;
bool int64_atomics;
+ bool storage_image_ms;
};
typedef struct shader_info {
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 7dc6bc914d6..2433d8638cc 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -3432,7 +3432,6 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvCapabilityVector16:
case SpvCapabilityFloat16Buffer:
case SpvCapabilityFloat16:
- case SpvCapabilityStorageImageMultisample:
case SpvCapabilityInt8:
case SpvCapabilitySparseResidency:
vtn_warn("Unsupported SPIR-V capability: %s",
@@ -3469,6 +3468,10 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
spv_check_supported(int64_atomics, cap);
break;
+ case SpvCapabilityStorageImageMultisample:
+ spv_check_supported(storage_image_ms, cap);
+ break;
+
case SpvCapabilityAddresses:
case SpvCapabilityKernel:
case SpvCapabilityImageBasic: