From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 6 Oct 2017 03:47:29 +0000 (-0700)
Subject: spirv: Don't warn on the ImageCubeArray capability
X-Git-Tag: android-x86-8.1-r1~9277
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=49a6fb8474457a1183f68af7edf630ccafa8c741;p=android-x86%2Fexternal-mesa.git

spirv: Don't warn on the ImageCubeArray capability

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 6ce9d1ada34..8fe379e4e07 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -2706,6 +2706,7 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
       case SpvCapabilitySampled1D:
       case SpvCapabilityImage1D:
       case SpvCapabilitySampledCubeArray:
+      case SpvCapabilityImageCubeArray:
       case SpvCapabilitySampledBuffer:
       case SpvCapabilityImageBuffer:
       case SpvCapabilityImageQuery:
@@ -2729,7 +2730,6 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
       case SpvCapabilityAtomicStorage:
       case SpvCapabilityInt16:
       case SpvCapabilityStorageImageMultisample:
-      case SpvCapabilityImageCubeArray:
       case SpvCapabilityInt8:
       case SpvCapabilitySparseResidency:
       case SpvCapabilityMinLod: