Import Mesa 13.0.2

1 files changed, 53 insertions, 10 deletions

diff --git a/lib/mesa/src/compiler/Makefile.sources b/lib/mesa/src/compiler/Makefile.sources
index c9780d6d6..2bb48683c 100644
--- a/lib/mesa/src/compiler/Makefile.sources
+++ b/lib/mesa/src/compiler/Makefile.sources
@@ -25,6 +25,8 @@ LIBGLSL_FILES = \
 	glsl/glsl_parser_extras.h \
 	glsl/glsl_symbol_table.cpp \
 	glsl/glsl_symbol_table.h \
+	glsl/glsl_to_nir.cpp \
+	glsl/glsl_to_nir.h \
 	glsl/hir_field_selection.cpp \
 	glsl/ir_basic_block.cpp \
 	glsl/ir_basic_block.h \
@@ -44,7 +46,6 @@ LIBGLSL_FILES = \
 	glsl/ir_hierarchical_visitor.cpp \
 	glsl/ir_hierarchical_visitor.h \
 	glsl/ir_hv_accept.cpp \
-	glsl/ir_import_prototypes.cpp \
 	glsl/ir_optimization.h \
 	glsl/ir_print_visitor.cpp \
 	glsl/ir_print_visitor.h \
@@ -75,12 +76,13 @@ LIBGLSL_FILES = \
 	glsl/loop_analysis.h \
 	glsl/loop_controls.cpp \
 	glsl/loop_unroll.cpp \
+	glsl/lower_blend_equation_advanced.cpp \
 	glsl/lower_buffer_access.cpp \
 	glsl/lower_buffer_access.h \
-	glsl/lower_clip_distance.cpp \
 	glsl/lower_const_arrays_to_uniforms.cpp \
 	glsl/lower_discard.cpp \
 	glsl/lower_discard_flow.cpp \
+	glsl/lower_distance.cpp \
 	glsl/lower_if_to_cond_assign.cpp \
 	glsl/lower_instructions.cpp \
 	glsl/lower_jumps.cpp \
@@ -129,20 +131,30 @@ LIBGLSL_FILES = \
 	glsl/opt_tree_grafting.cpp \
 	glsl/opt_vectorize.cpp \
 	glsl/program.h \
+	glsl/propagate_invariance.cpp \
 	glsl/s_expression.cpp \
 	glsl/s_expression.h
 
+LIBGLSL_SHADER_CACHE_FILES = \
+	glsl/cache.c \
+	glsl/cache.h
+
 # glsl_compiler
 
 GLSL_COMPILER_CXX_FILES = \
 	glsl/standalone_scaffolding.cpp \
 	glsl/standalone_scaffolding.h \
-	glsl/main.cpp
+	glsl/standalone.cpp \
+	glsl/standalone.h
 
 # libglsl generated sources
-LIBGLSL_GENERATED_CXX_FILES = \
+LIBGLSL_GENERATED_FILES = \
+	glsl/ir_expression_operation.h \
+	glsl/ir_expression_operation_constant.h \
+	glsl/ir_expression_operation_strings.h \
 	glsl/glsl_lexer.cpp \
-	glsl/glsl_parser.cpp
+	glsl/glsl_parser.cpp \
+	glsl/glsl_parser.h
 
 # libglcpp
 
@@ -162,8 +174,6 @@ NIR_GENERATED_FILES = \
 	nir/nir_opt_algebraic.c
 
 NIR_FILES = \
-	nir/glsl_to_nir.cpp \
-	nir/glsl_to_nir.h \
 	nir/nir.c \
 	nir/nir.h \
 	nir/nir_array.h \
@@ -175,23 +185,35 @@ NIR_FILES = \
 	nir/nir_control_flow_private.h \
 	nir/nir_dominance.c \
 	nir/nir_from_ssa.c \
+	nir/nir_gather_info.c \
 	nir/nir_gs_count_vertices.c \
-	nir/nir_intrinsics.c \
-	nir/nir_intrinsics.h \
+	nir/nir_inline_functions.c \
 	nir/nir_instr_set.c \
 	nir/nir_instr_set.h \
+	nir/nir_intrinsics.c \
+	nir/nir_intrinsics.h \
 	nir/nir_liveness.c \
 	nir/nir_lower_alu_to_scalar.c \
 	nir/nir_lower_atomics.c \
+	nir/nir_lower_bitmap.c \
+	nir/nir_lower_clamp_color_outputs.c \
 	nir/nir_lower_clip.c \
+	nir/nir_lower_double_ops.c \
+	nir/nir_lower_double_packing.c \
+	nir/nir_lower_drawpixels.c \
 	nir/nir_lower_global_vars_to_local.c \
 	nir/nir_lower_gs_intrinsics.c \
 	nir/nir_lower_load_const_to_scalar.c \
 	nir/nir_lower_locals_to_regs.c \
 	nir/nir_lower_idiv.c \
+	nir/nir_lower_indirect_derefs.c \
 	nir/nir_lower_io.c \
-	nir/nir_lower_outputs_to_temporaries.c \
+	nir/nir_lower_io_to_temporaries.c \
+	nir/nir_lower_io_to_scalar.c \
+	nir/nir_lower_io_types.c \
+	nir/nir_lower_passthrough_edgeflags.c \
 	nir/nir_lower_phis_to_scalar.c \
+	nir/nir_lower_returns.c \
 	nir/nir_lower_samplers.c \
 	nir/nir_lower_system_values.c \
 	nir/nir_lower_tex.c \
@@ -200,9 +222,12 @@ NIR_FILES = \
 	nir/nir_lower_vars_to_ssa.c \
 	nir/nir_lower_var_copies.c \
 	nir/nir_lower_vec_to_movs.c \
+	nir/nir_lower_wpos_center.c \
+	nir/nir_lower_wpos_ytransform.c \
 	nir/nir_metadata.c \
 	nir/nir_move_vec_src_uses_to_dest.c \
 	nir/nir_normalize_cubemap_coords.c \
+	nir/nir_opt_conditional_discard.c \
 	nir/nir_opt_constant_folding.c \
 	nir/nir_opt_copy_propagate.c \
 	nir/nir_opt_cse.c \
@@ -213,10 +238,15 @@ NIR_FILES = \
 	nir/nir_opt_peephole_select.c \
 	nir/nir_opt_remove_phis.c \
 	nir/nir_opt_undef.c \
+	nir/nir_phi_builder.c \
+	nir/nir_phi_builder.h \
 	nir/nir_print.c \
+	nir/nir_propagate_invariant.c \
 	nir/nir_remove_dead_variables.c \
+	nir/nir_repair_ssa.c \
 	nir/nir_search.c \
 	nir/nir_search.h \
+	nir/nir_search_helpers.h \
 	nir/nir_split_var_copies.c \
 	nir/nir_sweep.c \
 	nir/nir_to_ssa.c \
@@ -224,3 +254,16 @@ NIR_FILES = \
 	nir/nir_vla.h \
 	nir/nir_worklist.c \
 	nir/nir_worklist.h
+
+SPIRV_FILES = \
+	spirv/GLSL.std.450.h \
+	spirv/nir_spirv.h \
+	spirv/spirv.h \
+	spirv/spirv_info.h \
+	spirv/spirv_info.c \
+	spirv/spirv_to_nir.c \
+	spirv/vtn_alu.c \
+	spirv/vtn_cfg.c \
+	spirv/vtn_glsl450.c \
+	spirv/vtn_private.h \
+	spirv/vtn_variables.c