nir/spirv: Make the global constants in spirv.h static

I've been promissed in a bug that this will be fixed in a future version of
the header.  However, in the interest of my branch building, I'm adding
these changes in myself for the moment.

diff --git a/src/glsl/nir/spirv.h b/src/glsl/nir/spirv.h
index 93135c0..da717ec 100644 (file)
--- a/src/glsl/nir/spirv.h
+++ b/src/glsl/nir/spirv.h
@@ -48,13 +48,13 @@
 
 namespace spv {
 
-const int MagicNumber = 0x07230203;
-const int Version = 99;
+static const int MagicNumber = 0x07230203;
+static const int Version = 99;
 
 typedef unsigned int Id;
 
-const unsigned int OpCodeMask = 0xFFFF;
-const unsigned int WordCountShift = 16;
+static const unsigned int OpCodeMask = 0xFFFF;
+static const unsigned int WordCountShift = 16;
 
 enum SourceLanguage {
     SourceLanguageUnknown = 0,
@@ -677,13 +677,13 @@ enum Op {
 
 #ifndef __cplusplus
 
-const int SpvMagicNumber = 0x07230203;
-const int SpvVersion = 99;
+static const int SpvMagicNumber = 0x07230203;
+static const int SpvVersion = 99;
 
 typedef unsigned int SpvId;
 
-const unsigned int SpvOpCodeMask = 0xFFFF;
-const unsigned int SpvWordCountShift = 16;
+static const unsigned int SpvOpCodeMask = 0xFFFF;
+static const unsigned int SpvWordCountShift = 16;
 
 typedef enum SpvSourceLanguage_ {
     SpvSourceLanguageUnknown = 0,