From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 24 Feb 2016 06:02:41 +0000 (-0800)
Subject: nir/spirv: Allow but warn for a few capabilities
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c9564fd598573f609480f70a141b95900047ba58;p=mesa.git

nir/spirv: Allow but warn for a few capabilities

Unfortunately, glslang gives us cull/clip distance and GS streams even if
the shader doesn't use it whenever a shader is declared as version 450.
This is a glslang bug, but we can easily enough ignore it for now.
---

diff --git a/src/compiler/nir/spirv/spirv_to_nir.c b/src/compiler/nir/spirv/spirv_to_nir.c
index 91f5c4b5186..cb069b93ae8 100644
--- a/src/compiler/nir/spirv/spirv_to_nir.c
+++ b/src/compiler/nir/spirv/spirv_to_nir.c
@@ -2167,7 +2167,6 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
       case SpvCapabilitySampledImageArrayDynamicIndexing:
       case SpvCapabilityStorageBufferArrayDynamicIndexing:
       case SpvCapabilityStorageImageArrayDynamicIndexing:
-      case SpvCapabilityClipDistance:
       case SpvCapabilityImageRect:
       case SpvCapabilitySampledRect:
       case SpvCapabilitySampled1D:
@@ -2177,6 +2176,11 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
       case SpvCapabilityImageBuffer:
       case SpvCapabilityImageQuery:
          break;
+      case SpvCapabilityClipDistance:
+      case SpvCapabilityCullDistance:
+      case SpvCapabilityGeometryStreams:
+         fprintf(stderr, "WARNING: Unsupported SPIR-V Capability\n");
+         break;
       default:
          assert(!"Unsupported capability");
       }