Merge remote-tracking branch 'fdo-personal/nir-spirv' into vulkan

From now on, the majority of SPIR-V improvements should happen on the spirv
branch which will also be public.  It will be frequently merged into the
vulkan driver.

diff --cc src/glsl/nir/nir.h
Simple merge

diff --cc src/glsl/nir/spirv.h
index ea3799e2d8f5a9732283da3d5d3f960f374f9e89,d289c687c765c78764512de4b8dc24a947cbda49..8472caf30e5732e90a2f9923c08f7438345b2a7f
--- 1/src/glsl/nir/spirv.h
--- 2/src/glsl/nir/spirv.h
+++ b/src/glsl/nir/spirv.h
@@@ -1,20 -1,20 +1,35 @@@
  /*
  ** Copyright (c) 2014-2015 The Khronos Group Inc.
++<<<<<<< HEAD
 +** 
++=======
+ **
++>>>>>>> fdo-personal/nir-spirv
  ** Permission is hereby granted, free of charge, to any person obtaining a copy
  ** of this software and/or associated documentation files (the "Materials"),
  ** to deal in the Materials without restriction, including without limitation
  ** the rights to use, copy, modify, merge, publish, distribute, sublicense,
  ** and/or sell copies of the Materials, and to permit persons to whom the
  ** Materials are furnished to do so, subject to the following conditions:
++<<<<<<< HEAD
 +** 
 +** The above copyright notice and this permission notice shall be included in
 +** all copies or substantial portions of the Materials.
 +** 
 +** MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
 +** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
 +** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/ 
 +** 
++=======
+ **
+ ** The above copyright notice and this permission notice shall be included in
+ ** all copies or substantial portions of the Materials.
+ **
+ ** MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+ ** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+ ** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+ **
++>>>>>>> fdo-personal/nir-spirv
  ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  ** OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@@ -33,13 -33,13 +48,21 @@@
  ** Specification revision 31.
  ** Enumeration tokens for SPIR-V, in various styles:
  **   C, C++, C++11, JSON, Lua, Python
++<<<<<<< HEAD
 +** 
++=======
+ **
++>>>>>>> fdo-personal/nir-spirv
  ** - C will have tokens with a "Spv" prefix, e.g.: SpvSourceLanguageGLSL
  ** - C++ will have tokens in the "spv" name space, e.g.: spv::SourceLanguageGLSL
  ** - C++11 will use enum classes in the spv namespace, e.g.: spv::SourceLanguage::GLSL
  ** - Lua will use tables, e.g.: spv.SourceLanguage.GLSL
  ** - Python will use dictionaries, e.g.: spv['SourceLanguage']['GLSL']
++<<<<<<< HEAD
 +** 
++=======
+ **
++>>>>>>> fdo-personal/nir-spirv
  ** Some tokens act like mask values, which can be OR'd together,
  ** while others are mutually exclusive.  The mask-like ones have
  ** "Mask" in their name, and a parallel enum that has the shift