Mesa (master): spirv: add support for SpvCapabilityStorageImageMultisample

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Dec 17 17:24:06 2018 +0100

spirv: add support for SpvCapabilityStorageImageMultisample

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/compiler/shader_info.h        | 1 +
 src/compiler/spirv/spirv_to_nir.c | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h
index b21db3e60f..05f37c8d19 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 7dc6bc914d..2433d8638c 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: