From c313a989b4354318e6842867af35e58f686978bc Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 27 Aug 2015 15:24:04 -0700
Subject: [PATCH] spirv: Bump to the public revision 31

---
 src/glsl/nir/spirv.h        | 41 ++++++++++++++++++++++++-------------
 src/glsl/nir/spirv_to_nir.c |  4 ----
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/glsl/nir/spirv.h b/src/glsl/nir/spirv.h
index 55bdcbee8b5..ea3799e2d8f 100644
--- a/src/glsl/nir/spirv.h
+++ b/src/glsl/nir/spirv.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2015 The Khronos Group Inc.
+** Copyright (c) 2014-2015 The Khronos Group Inc.
 ** 
 ** Permission is hereby granted, free of charge, to any person obtaining a copy
 ** of this software and/or associated documentation files (the "Materials"),
@@ -53,6 +53,7 @@ typedef unsigned int SpvId;
 
 static const unsigned int SpvMagicNumber = 0x07230203;
 static const unsigned int SpvVersion = 99;
+static const unsigned int SpvRevision = 31;
 static const unsigned int SpvOpCodeMask = 0xffff;
 static const unsigned int SpvWordCountShift = 16;
 
@@ -130,7 +131,6 @@ typedef enum SpvStorageClass_ {
     SpvStorageClassPrivateGlobal = 6,
     SpvStorageClassFunction = 7,
     SpvStorageClassGeneric = 8,
-    SpvStorageClassPushConstant = 9,
     SpvStorageClassAtomicCounter = 10,
     SpvStorageClassImage = 11,
 } SpvStorageClass;
@@ -245,9 +245,10 @@ typedef enum SpvImageOperandsShift_ {
     SpvImageOperandsBiasShift = 0,
     SpvImageOperandsLodShift = 1,
     SpvImageOperandsGradShift = 2,
-    SpvImageOperandsOffsetShift = 3,
-    SpvImageOperandsOffsetsShift = 4,
-    SpvImageOperandsSampleShift = 5,
+    SpvImageOperandsConstOffsetShift = 3,
+    SpvImageOperandsOffsetShift = 4,
+    SpvImageOperandsConstOffsetsShift = 5,
+    SpvImageOperandsSampleShift = 6,
 } SpvImageOperandsShift;
 
 typedef enum SpvImageOperandsMask_ {
@@ -255,9 +256,10 @@ typedef enum SpvImageOperandsMask_ {
     SpvImageOperandsBiasMask = 0x00000001,
     SpvImageOperandsLodMask = 0x00000002,
     SpvImageOperandsGradMask = 0x00000004,
-    SpvImageOperandsOffsetMask = 0x00000008,
-    SpvImageOperandsOffsetsMask = 0x00000010,
-    SpvImageOperandsSampleMask = 0x00000020,
+    SpvImageOperandsConstOffsetMask = 0x00000008,
+    SpvImageOperandsOffsetMask = 0x00000010,
+    SpvImageOperandsConstOffsetsMask = 0x00000020,
+    SpvImageOperandsSampleMask = 0x00000040,
 } SpvImageOperandsMask;
 
 typedef enum SpvFPFastMathModeShift_ {
@@ -302,9 +304,8 @@ typedef enum SpvFunctionParameterAttribute_ {
     SpvFunctionParameterAttributeSret = 3,
     SpvFunctionParameterAttributeNoAlias = 4,
     SpvFunctionParameterAttributeNoCapture = 5,
-    SpvFunctionParameterAttributeSVM = 6,
-    SpvFunctionParameterAttributeNoWrite = 7,
-    SpvFunctionParameterAttributeNoReadWrite = 8,
+    SpvFunctionParameterAttributeNoWrite = 6,
+    SpvFunctionParameterAttributeNoReadWrite = 7,
 } SpvFunctionParameterAttribute;
 
 typedef enum SpvDecoration_ {
@@ -355,7 +356,6 @@ typedef enum SpvDecoration_ {
 typedef enum SpvBuiltIn_ {
     SpvBuiltInPosition = 0,
     SpvBuiltInPointSize = 1,
-    SpvBuiltInClipVertex = 2,
     SpvBuiltInClipDistance = 3,
     SpvBuiltInCullDistance = 4,
     SpvBuiltInVertexId = 5,
@@ -525,6 +525,19 @@ typedef enum SpvCapability_ {
     SpvCapabilityLiteralSampler = 20,
     SpvCapabilityAtomicStorage = 21,
     SpvCapabilityInt16 = 22,
+    SpvCapabilityTessellationPointSize = 23,
+    SpvCapabilityGeometryPointSize = 24,
+    SpvCapabilityImageGatherExtended = 25,
+    SpvCapabilityStorageImageExtendedFormats = 26,
+    SpvCapabilityStorageImageMultisample = 27,
+    SpvCapabilityUniformBufferArrayDynamicIndexing = 28,
+    SpvCapabilitySampledImageArrayDynamicIndexing = 29,
+    SpvCapabilityStorageBufferArrayDynamicIndexing = 30,
+    SpvCapabilityStorageImageArrayDynamicIndexing = 31,
+    SpvCapabilityClipDistance = 32,
+    SpvCapabilityCullDistance = 33,
+    SpvCapabilityImageCubeArray = 34,
+    SpvCapabilitySampleRateShading = 35,
 } SpvCapability;
 
 typedef enum SpvOp_ {
@@ -740,9 +753,9 @@ typedef enum SpvOp_ {
     SpvOpAtomicIDecrement = 233,
     SpvOpAtomicIAdd = 234,
     SpvOpAtomicISub = 235,
-    SpvOpAtomicIMin = 236,
+    SpvOpAtomicSMin = 236,
     SpvOpAtomicUMin = 237,
-    SpvOpAtomicIMax = 238,
+    SpvOpAtomicSMax = 238,
     SpvOpAtomicUMax = 239,
     SpvOpAtomicAnd = 240,
     SpvOpAtomicOr = 241,
diff --git a/src/glsl/nir/spirv_to_nir.c b/src/glsl/nir/spirv_to_nir.c
index 771637e8912..b09196ccd98 100644
--- a/src/glsl/nir/spirv_to_nir.c
+++ b/src/glsl/nir/spirv_to_nir.c
@@ -636,10 +636,6 @@ vtn_get_builtin_location(SpvBuiltIn builtin, int *location,
       *location = VARYING_SLOT_PSIZ;
       *mode = nir_var_shader_out;
       break;
-   case SpvBuiltInClipVertex:
-      *location = VARYING_SLOT_CLIP_VERTEX;
-      *mode = nir_var_shader_out;
-      break;
    case SpvBuiltInClipDistance:
       *location = VARYING_SLOT_CLIP_DIST0; /* XXX CLIP_DIST1? */
       *mode = nir_var_shader_in;
-- 
2.30.2