Merge ../mesa into vulkan

diff --cc configure.ac
Simple merge

diff --cc src/glsl/Makefile.am
index 1396758,95efdb3..2e180a5
--- 1/src/glsl/Makefile.am
--- 2/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@@ -144,9 -144,8 +144,9 @@@ libglsl_la_SOURCES =                                       
        glsl_parser.h                                   \
        $(LIBGLSL_FILES)                                \
        $(NIR_FILES)                                    \
-       $(NIR_GENERATED_FILES)
- 
 +      $(SPIRV_FILES)                                  \
+       $(NIR_GENERATED_FILES)                          \
+       $(GLSL_TO_NIR_FILES)
  
  libnir_la_SOURCES =                                   \
        $(NIR_FILES)                                    \

diff --cc src/glsl/Makefile.sources
Simple merge

diff --cc src/glsl/ast_to_hir.cpp
Simple merge

diff --cc src/glsl/glsl_parser_extras.cpp
Simple merge

diff --cc src/glsl/nir/glsl_to_nir.cpp
index 3cc42d2,12efb44..e9035b4
--- 1/src/glsl/nir/glsl_to_nir.cpp
--- 2/src/glsl/nir/glsl_to_nir.cpp
+++ b/src/glsl/nir/glsl_to_nir.cpp
@@@ -400,9 -388,8 +400,9 @@@ nir_visitor::visit(ir_variable *ir
     }
  
     var->data.index = ir->data.index;
 +   var->data.descriptor_set = 0;
     var->data.binding = ir->data.binding;
-    var->data.atomic.offset = ir->data.atomic.offset;
+    var->data.offset = ir->data.offset;
     var->data.image.read_only = ir->data.image_read_only;
     var->data.image.write_only = ir->data.image_write_only;
     var->data.image.coherent = ir->data.image_coherent;

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

diff --cc src/glsl/nir/nir_opt_algebraic.py
Simple merge

diff --cc src/glsl/nir/shader_enums.c
Simple merge

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

diff --cc src/glsl/standalone_scaffolding.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/Makefile.sources
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_device_info.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_fs.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_fs_nir.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_shader.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
Simple merge

diff --cc src/mesa/main/mtypes.h
Simple merge