From: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Date: Sat, 9 Jan 2016 06:16:43 +0000 (-0800)
Subject: Merge ../mesa into vulkan
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f0993f81c7fab4ceb99b010d8ee2facbf4fdc737;p=mesa.git

Merge ../mesa into vulkan
---

f0993f81c7fab4ceb99b010d8ee2facbf4fdc737
diff --cc src/glsl/Makefile.am
index 1396758b7c2,95efdb327c1..2e180a545ae
--- a/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)					\
 +	$(SPIRV_FILES)					\
- 	$(NIR_GENERATED_FILES)
- 
+ 	$(NIR_GENERATED_FILES)				\
+ 	$(GLSL_TO_NIR_FILES)
  
  libnir_la_SOURCES =					\
  	$(NIR_FILES)					\
diff --cc src/glsl/nir/glsl_to_nir.cpp
index 3cc42d229a0,12efb4419b2..e9035b4e1ba
--- a/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;