Revert to Mesa 13.0.6 to hopefully address rendering issues a handful of

people have reported with xpdf/fvwm on ivy bridge with modesetting driver.

1 files changed, 151 insertions, 169 deletions

diff --git a/lib/mesa/src/compiler/Makefile.in b/lib/mesa/src/compiler/Makefile.in
index b2aceebfe..81461a4e6 100644
--- a/lib/mesa/src/compiler/Makefile.in
+++ b/lib/mesa/src/compiler/Makefile.in
@@ -130,16 +130,15 @@ check_PROGRAMS = glsl/glcpp/glcpp$(EXEEXT) glsl/glsl_test$(EXEEXT) \
 	glsl/tests/sampler-types-test$(EXEEXT) \
 	glsl/tests/uniform-initializer-test$(EXEEXT) \
 	nir/tests/control_flow_tests$(EXEEXT)
-TESTS = glsl/glcpp/tests/glcpp-test.sh \
-	glsl/glcpp/tests/glcpp-test-cr-lf.sh \
+TESTS = glsl/glcpp/tests/glcpp-test glsl/glcpp/tests/glcpp-test-cr-lf \
 	glsl/tests/blob-test$(EXEEXT) glsl/tests/cache-test$(EXEEXT) \
 	glsl/tests/general-ir-test$(EXEEXT) \
-	glsl/tests/optimization-test.sh \
+	glsl/tests/optimization-test \
 	glsl/tests/sampler-types-test$(EXEEXT) \
 	glsl/tests/uniform-initializer-test$(EXEEXT) \
-	glsl/tests/warnings-test.sh \
-	nir/tests/control_flow_tests$(EXEEXT)
+	glsl/tests/warnings-test nir/tests/control_flow_tests$(EXEEXT)
 noinst_PROGRAMS = glsl_compiler$(EXEEXT) spirv2nir$(EXEEXT)
+@ENABLE_SHADER_CACHE_TRUE@am__append_1 = $(LIBGLSL_SHADER_CACHE_FILES)
 subdir = src/compiler
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gnu_make.m4 \
@@ -170,15 +169,84 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 glsl_libglsl_la_DEPENDENCIES = nir/libnir.la glsl/libglcpp.la
+am__glsl_libglsl_la_SOURCES_DIST = 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.h glsl/ast.h \
+	glsl/ast_array_index.cpp glsl/ast_expr.cpp \
+	glsl/ast_function.cpp glsl/ast_to_hir.cpp glsl/ast_type.cpp \
+	glsl/blob.c glsl/blob.h glsl/builtin_functions.cpp \
+	glsl/builtin_types.cpp glsl/builtin_variables.cpp \
+	glsl/glsl_parser_extras.cpp 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_array_refcount.cpp \
+	glsl/ir_array_refcount.h glsl/ir_basic_block.cpp \
+	glsl/ir_basic_block.h glsl/ir_builder.cpp glsl/ir_builder.h \
+	glsl/ir_clone.cpp glsl/ir_constant_expression.cpp glsl/ir.cpp \
+	glsl/ir.h glsl/ir_equals.cpp glsl/ir_expression_flattening.cpp \
+	glsl/ir_expression_flattening.h \
+	glsl/ir_function_can_inline.cpp \
+	glsl/ir_function_detect_recursion.cpp \
+	glsl/ir_function_inlining.h glsl/ir_function.cpp \
+	glsl/ir_hierarchical_visitor.cpp \
+	glsl/ir_hierarchical_visitor.h glsl/ir_hv_accept.cpp \
+	glsl/ir_optimization.h glsl/ir_print_visitor.cpp \
+	glsl/ir_print_visitor.h glsl/ir_reader.cpp glsl/ir_reader.h \
+	glsl/ir_rvalue_visitor.cpp glsl/ir_rvalue_visitor.h \
+	glsl/ir_set_program_inouts.cpp glsl/ir_uniform.h \
+	glsl/ir_validate.cpp glsl/ir_variable_refcount.cpp \
+	glsl/ir_variable_refcount.h glsl/ir_visitor.h glsl/linker.cpp \
+	glsl/linker.h glsl/link_atomics.cpp glsl/link_functions.cpp \
+	glsl/link_interface_blocks.cpp glsl/link_uniforms.cpp \
+	glsl/link_uniform_initializers.cpp \
+	glsl/link_uniform_block_active_visitor.cpp \
+	glsl/link_uniform_block_active_visitor.h \
+	glsl/link_uniform_blocks.cpp glsl/link_varyings.cpp \
+	glsl/link_varyings.h glsl/list.h glsl/loop_analysis.cpp \
+	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_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 glsl/lower_mat_op_to_vec.cpp \
+	glsl/lower_noise.cpp glsl/lower_offset_array.cpp \
+	glsl/lower_packed_varyings.cpp \
+	glsl/lower_named_interface_blocks.cpp \
+	glsl/lower_packing_builtins.cpp glsl/lower_subroutine.cpp \
+	glsl/lower_tess_level.cpp glsl/lower_texture_projection.cpp \
+	glsl/lower_variable_index_to_cond_assign.cpp \
+	glsl/lower_vec_index_to_cond_assign.cpp \
+	glsl/lower_vec_index_to_swizzle.cpp glsl/lower_vector.cpp \
+	glsl/lower_vector_derefs.cpp glsl/lower_vector_insert.cpp \
+	glsl/lower_vertex_id.cpp glsl/lower_output_reads.cpp \
+	glsl/lower_shared_reference.cpp glsl/lower_ubo_reference.cpp \
+	glsl/opt_algebraic.cpp glsl/opt_array_splitting.cpp \
+	glsl/opt_conditional_discard.cpp glsl/opt_constant_folding.cpp \
+	glsl/opt_constant_propagation.cpp \
+	glsl/opt_constant_variable.cpp glsl/opt_copy_propagation.cpp \
+	glsl/opt_copy_propagation_elements.cpp \
+	glsl/opt_dead_builtin_variables.cpp \
+	glsl/opt_dead_builtin_varyings.cpp glsl/opt_dead_code.cpp \
+	glsl/opt_dead_code_local.cpp glsl/opt_dead_functions.cpp \
+	glsl/opt_flatten_nested_if_blocks.cpp \
+	glsl/opt_flip_matrices.cpp glsl/opt_function_inlining.cpp \
+	glsl/opt_if_simplification.cpp glsl/opt_minmax.cpp \
+	glsl/opt_noop_swizzle.cpp glsl/opt_rebalance_tree.cpp \
+	glsl/opt_redundant_jumps.cpp glsl/opt_structure_splitting.cpp \
+	glsl/opt_swizzle_swizzle.cpp glsl/opt_tree_grafting.cpp \
+	glsl/opt_vectorize.cpp glsl/program.h \
+	glsl/propagate_invariance.cpp glsl/s_expression.cpp \
+	glsl/s_expression.h glsl/cache.c glsl/cache.h
 am__objects_2 = glsl/glsl_lexer.lo glsl/glsl_parser.lo
 am__objects_3 = glsl/ast_array_index.lo glsl/ast_expr.lo \
 	glsl/ast_function.lo glsl/ast_to_hir.lo glsl/ast_type.lo \
 	glsl/blob.lo glsl/builtin_functions.lo glsl/builtin_types.lo \
-	glsl/builtin_variables.lo glsl/generate_ir.lo \
-	glsl/glsl_parser_extras.lo glsl/glsl_symbol_table.lo \
-	glsl/glsl_to_nir.lo glsl/hir_field_selection.lo \
-	glsl/ir_array_refcount.lo glsl/ir_basic_block.lo \
-	glsl/ir_builder.lo glsl/ir_clone.lo \
+	glsl/builtin_variables.lo glsl/glsl_parser_extras.lo \
+	glsl/glsl_symbol_table.lo glsl/glsl_to_nir.lo \
+	glsl/hir_field_selection.lo glsl/ir_array_refcount.lo \
+	glsl/ir_basic_block.lo glsl/ir_builder.lo glsl/ir_clone.lo \
 	glsl/ir_constant_expression.lo glsl/ir.lo glsl/ir_equals.lo \
 	glsl/ir_expression_flattening.lo \
 	glsl/ir_function_can_inline.lo \
@@ -198,9 +266,9 @@ am__objects_3 = glsl/ast_array_index.lo glsl/ast_expr.lo \
 	glsl/lower_const_arrays_to_uniforms.lo glsl/lower_discard.lo \
 	glsl/lower_discard_flow.lo glsl/lower_distance.lo \
 	glsl/lower_if_to_cond_assign.lo glsl/lower_instructions.lo \
-	glsl/lower_int64.lo glsl/lower_jumps.lo \
-	glsl/lower_mat_op_to_vec.lo glsl/lower_noise.lo \
-	glsl/lower_offset_array.lo glsl/lower_packed_varyings.lo \
+	glsl/lower_jumps.lo glsl/lower_mat_op_to_vec.lo \
+	glsl/lower_noise.lo glsl/lower_offset_array.lo \
+	glsl/lower_packed_varyings.lo \
 	glsl/lower_named_interface_blocks.lo \
 	glsl/lower_packing_builtins.lo glsl/lower_subroutine.lo \
 	glsl/lower_tess_level.lo glsl/lower_texture_projection.lo \
@@ -225,73 +293,65 @@ am__objects_3 = glsl/ast_array_index.lo glsl/ast_expr.lo \
 	glsl/opt_structure_splitting.lo glsl/opt_swizzle_swizzle.lo \
 	glsl/opt_tree_grafting.lo glsl/opt_vectorize.lo \
 	glsl/propagate_invariance.lo glsl/s_expression.lo
-am__objects_4 = glsl/shader_cache.lo
+am__objects_4 = glsl/cache.lo
+@ENABLE_SHADER_CACHE_TRUE@am__objects_5 = $(am__objects_4)
 am_glsl_libglsl_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
-	$(am__objects_4)
+	$(am__objects_5)
 glsl_libglsl_la_OBJECTS = $(am_glsl_libglsl_la_OBJECTS)
 am__DEPENDENCIES_1 =
 glsl_libstandalone_la_DEPENDENCIES = glsl/libglsl.la \
 	$(top_builddir)/src/libglsl_util.la \
 	$(top_builddir)/src/util/libmesautil.la $(am__DEPENDENCIES_1)
-am__objects_5 = glsl/ir_builder_print_visitor.lo \
-	glsl/standalone_scaffolding.lo glsl/standalone.lo
-am_glsl_libstandalone_la_OBJECTS = $(am__objects_5)
+am__objects_6 = glsl/standalone_scaffolding.lo glsl/standalone.lo
+am_glsl_libstandalone_la_OBJECTS = $(am__objects_6)
 glsl_libstandalone_la_OBJECTS = $(am_glsl_libstandalone_la_OBJECTS)
 libcompiler_la_LIBADD =
-am__objects_6 = glsl_types.lo nir_types.lo shader_enums.lo
-am_libcompiler_la_OBJECTS = $(am__objects_6)
+am__objects_7 = glsl_types.lo nir_types.lo shader_enums.lo
+am_libcompiler_la_OBJECTS = $(am__objects_7)
 libcompiler_la_OBJECTS = $(am_libcompiler_la_OBJECTS)
 nir_libnir_la_DEPENDENCIES = libcompiler.la
-am__objects_7 = nir/nir.lo nir/nir_clone.lo nir/nir_control_flow.lo \
+am__objects_8 = nir/nir.lo nir/nir_clone.lo nir/nir_control_flow.lo \
 	nir/nir_dominance.lo nir/nir_from_ssa.lo \
 	nir/nir_gather_info.lo nir/nir_gs_count_vertices.lo \
 	nir/nir_inline_functions.lo nir/nir_instr_set.lo \
 	nir/nir_intrinsics.lo nir/nir_liveness.lo \
-	nir/nir_loop_analyze.lo nir/nir_lower_64bit_packing.lo \
 	nir/nir_lower_alu_to_scalar.lo nir/nir_lower_atomics.lo \
 	nir/nir_lower_bitmap.lo nir/nir_lower_clamp_color_outputs.lo \
-	nir/nir_lower_clip.lo \
-	nir/nir_lower_clip_cull_distance_arrays.lo \
-	nir/nir_lower_constant_initializers.lo \
-	nir/nir_lower_double_ops.lo nir/nir_lower_drawpixels.lo \
+	nir/nir_lower_clip.lo nir/nir_lower_double_ops.lo \
+	nir/nir_lower_double_packing.lo nir/nir_lower_drawpixels.lo \
 	nir/nir_lower_global_vars_to_local.lo \
 	nir/nir_lower_gs_intrinsics.lo \
 	nir/nir_lower_load_const_to_scalar.lo \
 	nir/nir_lower_locals_to_regs.lo nir/nir_lower_idiv.lo \
-	nir/nir_lower_indirect_derefs.lo nir/nir_lower_int64.lo \
-	nir/nir_lower_io.lo nir/nir_lower_io_to_temporaries.lo \
+	nir/nir_lower_indirect_derefs.lo nir/nir_lower_io.lo \
+	nir/nir_lower_io_to_temporaries.lo \
 	nir/nir_lower_io_to_scalar.lo nir/nir_lower_io_types.lo \
 	nir/nir_lower_passthrough_edgeflags.lo \
-	nir/nir_lower_patch_vertices.lo \
-	nir/nir_lower_phis_to_scalar.lo nir/nir_lower_regs_to_ssa.lo \
-	nir/nir_lower_returns.lo nir/nir_lower_samplers.lo \
-	nir/nir_lower_system_values.lo nir/nir_lower_tex.lo \
-	nir/nir_lower_to_source_mods.lo \
+	nir/nir_lower_phis_to_scalar.lo nir/nir_lower_returns.lo \
+	nir/nir_lower_samplers.lo nir/nir_lower_system_values.lo \
+	nir/nir_lower_tex.lo nir/nir_lower_to_source_mods.lo \
 	nir/nir_lower_two_sided_color.lo nir/nir_lower_vars_to_ssa.lo \
 	nir/nir_lower_var_copies.lo nir/nir_lower_vec_to_movs.lo \
 	nir/nir_lower_wpos_center.lo nir/nir_lower_wpos_ytransform.lo \
 	nir/nir_metadata.lo nir/nir_move_vec_src_uses_to_dest.lo \
 	nir/nir_normalize_cubemap_coords.lo \
 	nir/nir_opt_conditional_discard.lo \
-	nir/nir_opt_constant_folding.lo nir/nir_opt_copy_prop_vars.lo \
-	nir/nir_opt_copy_propagate.lo nir/nir_opt_cse.lo \
-	nir/nir_opt_dce.lo nir/nir_opt_dead_cf.lo nir/nir_opt_gcm.lo \
-	nir/nir_opt_global_to_local.lo nir/nir_opt_if.lo \
-	nir/nir_opt_loop_unroll.lo nir/nir_opt_move_comparisons.lo \
+	nir/nir_opt_constant_folding.lo nir/nir_opt_copy_propagate.lo \
+	nir/nir_opt_cse.lo nir/nir_opt_dce.lo nir/nir_opt_dead_cf.lo \
+	nir/nir_opt_gcm.lo nir/nir_opt_global_to_local.lo \
 	nir/nir_opt_peephole_select.lo nir/nir_opt_remove_phis.lo \
-	nir/nir_opt_trivial_continues.lo nir/nir_opt_undef.lo \
-	nir/nir_phi_builder.lo nir/nir_print.lo \
+	nir/nir_opt_undef.lo nir/nir_phi_builder.lo nir/nir_print.lo \
 	nir/nir_propagate_invariant.lo \
 	nir/nir_remove_dead_variables.lo nir/nir_repair_ssa.lo \
 	nir/nir_search.lo nir/nir_split_var_copies.lo nir/nir_sweep.lo \
-	nir/nir_to_lcssa.lo nir/nir_validate.lo nir/nir_worklist.lo
-am__objects_8 = spirv/spirv_info.lo spirv/spirv_to_nir.lo \
+	nir/nir_to_ssa.lo nir/nir_validate.lo nir/nir_worklist.lo
+am__objects_9 = spirv/spirv_info.lo spirv/spirv_to_nir.lo \
 	spirv/vtn_alu.lo spirv/vtn_cfg.lo spirv/vtn_glsl450.lo \
 	spirv/vtn_variables.lo
-am__objects_9 = nir/nir_constant_expressions.lo nir/nir_opcodes.lo \
+am__objects_10 = nir/nir_constant_expressions.lo nir/nir_opcodes.lo \
 	nir/nir_opt_algebraic.lo
-am_nir_libnir_la_OBJECTS = $(am__objects_7) $(am__objects_8) \
-	$(am__objects_9)
+am_nir_libnir_la_OBJECTS = $(am__objects_8) $(am__objects_9) \
+	$(am__objects_10)
 nir_libnir_la_OBJECTS = $(am_nir_libnir_la_OBJECTS)
 PROGRAMS = $(noinst_PROGRAMS)
 am_glsl_glcpp_glcpp_OBJECTS = glsl/glcpp/glcpp.$(OBJEXT)
@@ -302,8 +362,7 @@ am_glsl_glsl_test_OBJECTS = glsl/test.$(OBJEXT) \
 	glsl/test_optpass.$(OBJEXT)
 glsl_glsl_test_OBJECTS = $(am_glsl_glsl_test_OBJECTS)
 glsl_glsl_test_DEPENDENCIES = glsl/libglsl.la glsl/libstandalone.la \
-	$(top_builddir)/src/libglsl_util.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(top_builddir)/src/libglsl_util.la $(am__DEPENDENCIES_1)
 am_glsl_tests_blob_test_OBJECTS = glsl/tests/blob_test.$(OBJEXT)
 glsl_tests_blob_test_OBJECTS = $(am_glsl_tests_blob_test_OBJECTS)
 glsl_tests_blob_test_DEPENDENCIES = glsl/libglsl.la
@@ -311,7 +370,7 @@ am_glsl_tests_cache_test_OBJECTS =  \
 	glsl/tests/glsl_tests_cache_test-cache_test.$(OBJEXT)
 glsl_tests_cache_test_OBJECTS = $(am_glsl_tests_cache_test_OBJECTS)
 glsl_tests_cache_test_DEPENDENCIES = glsl/libglsl.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 glsl_tests_cache_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(glsl_tests_cache_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -321,15 +380,13 @@ am_glsl_tests_general_ir_test_OBJECTS =  \
 	glsl/tests/builtin_variable_test.$(OBJEXT) \
 	glsl/tests/invalidate_locations_test.$(OBJEXT) \
 	glsl/tests/general_ir_test.$(OBJEXT) \
-	glsl/tests/lower_int64_test.$(OBJEXT) \
-	glsl/tests/opt_add_neg_to_sub_test.$(OBJEXT) \
 	glsl/tests/varyings_test.$(OBJEXT)
 glsl_tests_general_ir_test_OBJECTS =  \
 	$(am_glsl_tests_general_ir_test_OBJECTS)
 glsl_tests_general_ir_test_DEPENDENCIES =  \
 	$(top_builddir)/src/gtest/libgtest.la glsl/libglsl.la \
 	glsl/libstandalone.la $(top_builddir)/src/libglsl_util.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 am_glsl_tests_sampler_types_test_OBJECTS =  \
 	glsl/tests/sampler_types_test.$(OBJEXT)
 glsl_tests_sampler_types_test_OBJECTS =  \
@@ -348,8 +405,7 @@ glsl_tests_uniform_initializer_test_DEPENDENCIES =  \
 	$(top_builddir)/src/libglsl_util.la $(am__DEPENDENCIES_1)
 am_glsl_compiler_OBJECTS = glsl/main.$(OBJEXT)
 glsl_compiler_OBJECTS = $(am_glsl_compiler_OBJECTS)
-glsl_compiler_DEPENDENCIES = glsl/libstandalone.la \
-	$(am__DEPENDENCIES_1)
+glsl_compiler_DEPENDENCIES = glsl/libstandalone.la
 am_nir_tests_control_flow_tests_OBJECTS = nir/tests/nir_tests_control_flow_tests-control_flow_tests.$(OBJEXT)
 nir_tests_control_flow_tests_OBJECTS =  \
 	$(am_nir_tests_control_flow_tests_OBJECTS)
@@ -423,7 +479,8 @@ SOURCES = $(glsl_libglcpp_la_SOURCES) $(glsl_libglsl_la_SOURCES) \
 	$(glsl_compiler_SOURCES) \
 	$(nir_tests_control_flow_tests_SOURCES) $(spirv2nir_SOURCES) \
 	$(nodist_EXTRA_spirv2nir_SOURCES)
-DIST_SOURCES = $(glsl_libglcpp_la_SOURCES) $(glsl_libglsl_la_SOURCES) \
+DIST_SOURCES = $(glsl_libglcpp_la_SOURCES) \
+	$(am__glsl_libglsl_la_SOURCES_DIST) \
 	$(glsl_libstandalone_la_SOURCES) $(libcompiler_la_SOURCES) \
 	$(nir_libnir_la_SOURCES) $(glsl_glcpp_glcpp_SOURCES) \
 	$(glsl_glsl_test_SOURCES) $(glsl_tests_blob_test_SOURCES) \
@@ -450,8 +507,6 @@ AMDGPU_CFLAGS = @AMDGPU_CFLAGS@
 AMDGPU_LIBS = @AMDGPU_LIBS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-ANDROID_CFLAGS = @ANDROID_CFLAGS@
-ANDROID_LIBS = @ANDROID_LIBS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -482,6 +537,8 @@ DLLTOOL = @DLLTOOL@
 DLOPEN_LIBS = @DLOPEN_LIBS@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
+DRI3PROTO_CFLAGS = @DRI3PROTO_CFLAGS@
+DRI3PROTO_LIBS = @DRI3PROTO_LIBS@
 DRIGL_CFLAGS = @DRIGL_CFLAGS@
 DRIGL_LIBS = @DRIGL_LIBS@
 DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@
@@ -494,11 +551,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGL_CFLAGS = @EGL_CFLAGS@
+EGL_CLIENT_APIS = @EGL_CLIENT_APIS@
 EGL_LIB_DEPS = @EGL_LIB_DEPS@
 EGL_NATIVE_PLATFORM = @EGL_NATIVE_PLATFORM@
 EGREP = @EGREP@
-ETNAVIV_CFLAGS = @ETNAVIV_CFLAGS@
-ETNAVIV_LIBS = @ETNAVIV_LIBS@
 EXEEXT = @EXEEXT@
 EXPAT_CFLAGS = @EXPAT_CFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
@@ -546,27 +602,31 @@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
 LIBDRM_LIBS = @LIBDRM_LIBS@
 LIBELF_CFLAGS = @LIBELF_CFLAGS@
 LIBELF_LIBS = @LIBELF_LIBS@
-LIBGLVND_DATADIR = @LIBGLVND_DATADIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBSENSORS_LIBS = @LIBSENSORS_LIBS@
+LIBSENSORS_LDFLAGS = @LIBSENSORS_LDFLAGS@
+LIBSHA1_CFLAGS = @LIBSHA1_CFLAGS@
+LIBSHA1_LIBS = @LIBSHA1_LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
-LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
 LIB_DIR = @LIB_DIR@
 LIB_EXT = @LIB_EXT@
 LIPO = @LIPO@
+LLVM_BINDIR = @LLVM_BINDIR@
 LLVM_CFLAGS = @LLVM_CFLAGS@
 LLVM_CONFIG = @LLVM_CONFIG@
+LLVM_CPPFLAGS = @LLVM_CPPFLAGS@
 LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
 LLVM_INCLUDEDIR = @LLVM_INCLUDEDIR@
 LLVM_LDFLAGS = @LLVM_LDFLAGS@
+LLVM_LIBDIR = @LLVM_LIBDIR@
 LLVM_LIBS = @LLVM_LIBS@
+LLVM_VERSION = @LLVM_VERSION@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
+MESA_LLVM = @MESA_LLVM@
 MKDIR_P = @MKDIR_P@
 MSVC2013_COMPAT_CFLAGS = @MSVC2013_COMPAT_CFLAGS@
 MSVC2013_COMPAT_CXXFLAGS = @MSVC2013_COMPAT_CXXFLAGS@
@@ -587,6 +647,8 @@ OMX_LIBS = @OMX_LIBS@
 OMX_LIB_INSTALL_DIR = @OMX_LIB_INSTALL_DIR@
 OPENCL_LIBNAME = @OPENCL_LIBNAME@
 OPENCL_VERSION = @OPENCL_VERSION@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
 OSMESA_LIB = @OSMESA_LIB@
 OSMESA_LIB_DEPS = @OSMESA_LIB_DEPS@
 OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@
@@ -606,6 +668,8 @@ PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSIX_SHELL = @POSIX_SHELL@
+PRESENTPROTO_CFLAGS = @PRESENTPROTO_CFLAGS@
+PRESENTPROTO_LIBS = @PRESENTPROTO_LIBS@
 PTHREADSTUBS_CFLAGS = @PTHREADSTUBS_CFLAGS@
 PTHREADSTUBS_LIBS = @PTHREADSTUBS_LIBS@
 PTHREAD_CC = @PTHREAD_CC@
@@ -621,6 +685,8 @@ SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
 SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
+SHA1_CFLAGS = @SHA1_CFLAGS@
+SHA1_LIBS = @SHA1_LIBS@
 SHELL = @SHELL@
 SIMPENROSE_CFLAGS = @SIMPENROSE_CFLAGS@
 SIMPENROSE_LIBS = @SIMPENROSE_LIBS@
@@ -629,6 +695,7 @@ STRIP = @STRIP@
 SWR_AVX2_CXXFLAGS = @SWR_AVX2_CXXFLAGS@
 SWR_AVX_CXXFLAGS = @SWR_AVX_CXXFLAGS@
 SWR_CXX11_CXXFLAGS = @SWR_CXX11_CXXFLAGS@
+TIMESTAMP_CMD = @TIMESTAMP_CMD@
 VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
 VALGRIND_LIBS = @VALGRIND_LIBS@
 VA_CFLAGS = @VA_CFLAGS@
@@ -644,6 +711,7 @@ VDPAU_LIB_INSTALL_DIR = @VDPAU_LIB_INSTALL_DIR@
 VDPAU_MAJOR = @VDPAU_MAJOR@
 VDPAU_MINOR = @VDPAU_MINOR@
 VERSION = @VERSION@
+VG_LIB_DEPS = @VG_LIB_DEPS@
 VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
 VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
 VL_CFLAGS = @VL_CFLAGS@
@@ -672,10 +740,9 @@ XVMC_LIBS = @XVMC_LIBS@
 XVMC_LIB_INSTALL_DIR = @XVMC_LIB_INSTALL_DIR@
 XVMC_MAJOR = @XVMC_MAJOR@
 XVMC_MINOR = @XVMC_MINOR@
+XXD = @XXD@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
-ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -743,8 +810,7 @@ LIBCOMPILER_FILES = \
 	nir_types.cpp \
 	nir_types.h \
 	shader_enums.c \
-	shader_enums.h \
-	shader_info.h
+	shader_enums.h
 
 
 # libglsl
@@ -758,11 +824,8 @@ LIBGLSL_FILES = \
 	glsl/blob.c \
 	glsl/blob.h \
 	glsl/builtin_functions.cpp \
-	glsl/builtin_functions.h \
-	glsl/builtin_int64.h \
 	glsl/builtin_types.cpp \
 	glsl/builtin_variables.cpp \
-	glsl/generate_ir.cpp \
 	glsl/glsl_parser_extras.cpp \
 	glsl/glsl_parser_extras.h \
 	glsl/glsl_symbol_table.cpp \
@@ -829,7 +892,6 @@ LIBGLSL_FILES = \
 	glsl/lower_distance.cpp \
 	glsl/lower_if_to_cond_assign.cpp \
 	glsl/lower_instructions.cpp \
-	glsl/lower_int64.cpp \
 	glsl/lower_jumps.cpp \
 	glsl/lower_mat_op_to_vec.cpp \
 	glsl/lower_noise.cpp \
@@ -881,15 +943,12 @@ LIBGLSL_FILES = \
 	glsl/s_expression.h
 
 LIBGLSL_SHADER_CACHE_FILES = \
-	glsl/shader_cache.cpp \
-	glsl/shader_cache.h
+	glsl/cache.c \
+	glsl/cache.h
 
 
 # glsl_compiler
 GLSL_COMPILER_CXX_FILES = \
-	glsl/ir_builder_print_visitor.cpp \
-	glsl/ir_builder_print_visitor.h \
-	glsl/opt_add_neg_to_sub.h \
 	glsl/standalone_scaffolding.cpp \
 	glsl/standalone_scaffolding.h \
 	glsl/standalone.cpp \
@@ -942,17 +1001,13 @@ NIR_FILES = \
 	nir/nir_intrinsics.c \
 	nir/nir_intrinsics.h \
 	nir/nir_liveness.c \
-	nir/nir_loop_analyze.c \
-	nir/nir_loop_analyze.h \
-	nir/nir_lower_64bit_packing.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_clip_cull_distance_arrays.c \
-	nir/nir_lower_constant_initializers.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 \
@@ -960,15 +1015,12 @@ NIR_FILES = \
 	nir/nir_lower_locals_to_regs.c \
 	nir/nir_lower_idiv.c \
 	nir/nir_lower_indirect_derefs.c \
-	nir/nir_lower_int64.c \
 	nir/nir_lower_io.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_patch_vertices.c \
 	nir/nir_lower_phis_to_scalar.c \
-	nir/nir_lower_regs_to_ssa.c \
 	nir/nir_lower_returns.c \
 	nir/nir_lower_samplers.c \
 	nir/nir_lower_system_values.c \
@@ -985,19 +1037,14 @@ NIR_FILES = \
 	nir/nir_normalize_cubemap_coords.c \
 	nir/nir_opt_conditional_discard.c \
 	nir/nir_opt_constant_folding.c \
-	nir/nir_opt_copy_prop_vars.c \
 	nir/nir_opt_copy_propagate.c \
 	nir/nir_opt_cse.c \
 	nir/nir_opt_dce.c \
 	nir/nir_opt_dead_cf.c \
 	nir/nir_opt_gcm.c \
 	nir/nir_opt_global_to_local.c \
-	nir/nir_opt_if.c \
-	nir/nir_opt_loop_unroll.c \
-	nir/nir_opt_move_comparisons.c \
 	nir/nir_opt_peephole_select.c \
 	nir/nir_opt_remove_phis.c \
-	nir/nir_opt_trivial_continues.c \
 	nir/nir_opt_undef.c \
 	nir/nir_phi_builder.c \
 	nir/nir_phi_builder.h \
@@ -1010,7 +1057,7 @@ NIR_FILES = \
 	nir/nir_search_helpers.h \
 	nir/nir_split_var_copies.c \
 	nir/nir_sweep.c \
-	nir/nir_to_lcssa.c \
+	nir/nir_to_ssa.c \
 	nir/nir_validate.c \
 	nir/nir_vla.h \
 	nir/nir_worklist.c \
@@ -1082,11 +1129,9 @@ EXTRA_DIST = SConscript glsl/tests glsl/glcpp/tests glsl/README \
 	SConscript.glsl nir/nir_algebraic.py \
 	nir/nir_builder_opcodes_h.py nir/nir_constant_expressions.py \
 	nir/nir_opcodes.py nir/nir_opcodes_c.py nir/nir_opcodes_h.py \
-	nir/nir_opt_algebraic.py nir/tests nir/README SConscript.nir
+	nir/nir_opt_algebraic.py nir/tests SConscript.nir
 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
 TESTS_ENVIRONMENT = \
-	export abs_builddir=$(abs_builddir); \
 	export PYTHON2=$(PYTHON2); \
 	export PYTHON_FLAGS=$(PYTHON_FLAGS);
 
@@ -1104,16 +1149,13 @@ glsl_tests_cache_test_CFLAGS = \
 
 glsl_tests_cache_test_LDADD = \
 	glsl/libglsl.la					\
-	$(PTHREAD_LIBS)					\
-	$(CLOCK_LIB)
+	$(PTHREAD_LIBS)
 
 glsl_tests_general_ir_test_SOURCES = \
 	glsl/tests/array_refcount_test.cpp 		\
 	glsl/tests/builtin_variable_test.cpp		\
 	glsl/tests/invalidate_locations_test.cpp	\
 	glsl/tests/general_ir_test.cpp			\
-	glsl/tests/lower_int64_test.cpp			\
-	glsl/tests/opt_add_neg_to_sub_test.cpp		\
 	glsl/tests/varyings_test.cpp
 
 glsl_tests_general_ir_test_CFLAGS = \
@@ -1124,8 +1166,7 @@ glsl_tests_general_ir_test_LDADD = \
 	glsl/libglsl.la		\
 	glsl/libstandalone.la				\
 	$(top_builddir)/src/libglsl_util.la		\
-	$(PTHREAD_LIBS)					\
-	$(CLOCK_LIB)
+	$(PTHREAD_LIBS)
 
 glsl_tests_uniform_initializer_test_SOURCES = \
 	glsl/tests/copy_constant_to_storage_tests.cpp	\
@@ -1175,11 +1216,8 @@ glsl_libglsl_la_LIBADD = \
 	nir/libnir.la \
 	glsl/libglcpp.la
 
-glsl_libglsl_la_SOURCES = \
-	$(LIBGLSL_GENERATED_FILES)			\
-	$(LIBGLSL_FILES)				\
-	$(LIBGLSL_SHADER_CACHE_FILES)
-
+glsl_libglsl_la_SOURCES = $(LIBGLSL_GENERATED_FILES) $(LIBGLSL_FILES) \
+	$(am__append_1)
 glsl_libstandalone_la_SOURCES = \
 	$(GLSL_COMPILER_CXX_FILES)
 
@@ -1193,8 +1231,7 @@ glsl_compiler_SOURCES = \
 	glsl/main.cpp
 
 glsl_compiler_LDADD = \
-	glsl/libstandalone.la \
-	$(CLOCK_LIB)
+	glsl/libstandalone.la
 
 glsl_glsl_test_SOURCES = \
 	glsl/test.cpp \
@@ -1205,8 +1242,7 @@ glsl_glsl_test_LDADD = \
 	glsl/libglsl.la					\
 	glsl/libstandalone.la				\
 	$(top_builddir)/src/libglsl_util.la		\
-	$(PTHREAD_LIBS)					\
-	$(CLOCK_LIB)
+	$(PTHREAD_LIBS)
 
 
 # We write our own rules for yacc and lex below. We'd rather use automake,
@@ -1238,6 +1274,7 @@ am__v_YACC_0 = @echo "  YACC    " $@;
 am__v_YACC_1 = 
 YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS)
 LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS)
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
 nir_libnir_la_LIBADD = \
 	libcompiler.la
 
@@ -1365,8 +1402,6 @@ glsl/builtin_types.lo: glsl/$(am__dirstamp) \
 	glsl/$(DEPDIR)/$(am__dirstamp)
 glsl/builtin_variables.lo: glsl/$(am__dirstamp) \
 	glsl/$(DEPDIR)/$(am__dirstamp)
-glsl/generate_ir.lo: glsl/$(am__dirstamp) \
-	glsl/$(DEPDIR)/$(am__dirstamp)
 glsl/glsl_parser_extras.lo: glsl/$(am__dirstamp) \
 	glsl/$(DEPDIR)/$(am__dirstamp)
 glsl/glsl_symbol_table.lo: glsl/$(am__dirstamp) \
@@ -1448,8 +1483,6 @@ glsl/lower_if_to_cond_assign.lo: glsl/$(am__dirstamp) \
 	glsl/$(DEPDIR)/$(am__dirstamp)
 glsl/lower_instructions.lo: glsl/$(am__dirstamp) \
 	glsl/$(DEPDIR)/$(am__dirstamp)
-glsl/lower_int64.lo: glsl/$(am__dirstamp) \
-	glsl/$(DEPDIR)/$(am__dirstamp)
 glsl/lower_jumps.lo: glsl/$(am__dirstamp) \
 	glsl/$(DEPDIR)/$(am__dirstamp)
 glsl/lower_mat_op_to_vec.lo: glsl/$(am__dirstamp) \
@@ -1544,12 +1577,9 @@ glsl/propagate_invariance.lo: glsl/$(am__dirstamp) \
 	glsl/$(DEPDIR)/$(am__dirstamp)
 glsl/s_expression.lo: glsl/$(am__dirstamp) \
 	glsl/$(DEPDIR)/$(am__dirstamp)
-glsl/shader_cache.lo: glsl/$(am__dirstamp) \
-	glsl/$(DEPDIR)/$(am__dirstamp)
+glsl/cache.lo: glsl/$(am__dirstamp) glsl/$(DEPDIR)/$(am__dirstamp)
 glsl/libglsl.la: $(glsl_libglsl_la_OBJECTS) $(glsl_libglsl_la_DEPENDENCIES) $(EXTRA_glsl_libglsl_la_DEPENDENCIES) glsl/$(am__dirstamp)
 	$(AM_V_CXXLD)$(CXXLINK)  $(glsl_libglsl_la_OBJECTS) $(glsl_libglsl_la_LIBADD) $(LIBS)
-glsl/ir_builder_print_visitor.lo: glsl/$(am__dirstamp) \
-	glsl/$(DEPDIR)/$(am__dirstamp)
 glsl/standalone_scaffolding.lo: glsl/$(am__dirstamp) \
 	glsl/$(DEPDIR)/$(am__dirstamp)
 glsl/standalone.lo: glsl/$(am__dirstamp) \
@@ -1582,10 +1612,6 @@ nir/nir_instr_set.lo: nir/$(am__dirstamp) \
 nir/nir_intrinsics.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_liveness.lo: nir/$(am__dirstamp) nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_loop_analyze.lo: nir/$(am__dirstamp) \
-	nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_lower_64bit_packing.lo: nir/$(am__dirstamp) \
-	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_alu_to_scalar.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_atomics.lo: nir/$(am__dirstamp) \
@@ -1596,12 +1622,10 @@ nir/nir_lower_clamp_color_outputs.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_clip.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_lower_clip_cull_distance_arrays.lo: nir/$(am__dirstamp) \
-	nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_lower_constant_initializers.lo: nir/$(am__dirstamp) \
-	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_double_ops.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
+nir/nir_lower_double_packing.lo: nir/$(am__dirstamp) \
+	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_drawpixels.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_global_vars_to_local.lo: nir/$(am__dirstamp) \
@@ -1616,8 +1640,6 @@ nir/nir_lower_idiv.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_indirect_derefs.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_lower_int64.lo: nir/$(am__dirstamp) \
-	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_io.lo: nir/$(am__dirstamp) nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_io_to_temporaries.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
@@ -1627,12 +1649,8 @@ nir/nir_lower_io_types.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_passthrough_edgeflags.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_lower_patch_vertices.lo: nir/$(am__dirstamp) \
-	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_phis_to_scalar.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_lower_regs_to_ssa.lo: nir/$(am__dirstamp) \
-	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_returns.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_lower_samplers.lo: nir/$(am__dirstamp) \
@@ -1664,8 +1682,6 @@ nir/nir_opt_conditional_discard.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_opt_constant_folding.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_opt_copy_prop_vars.lo: nir/$(am__dirstamp) \
-	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_opt_copy_propagate.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_opt_cse.lo: nir/$(am__dirstamp) nir/$(DEPDIR)/$(am__dirstamp)
@@ -1675,17 +1691,10 @@ nir/nir_opt_dead_cf.lo: nir/$(am__dirstamp) \
 nir/nir_opt_gcm.lo: nir/$(am__dirstamp) nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_opt_global_to_local.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_opt_if.lo: nir/$(am__dirstamp) nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_opt_loop_unroll.lo: nir/$(am__dirstamp) \
-	nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_opt_move_comparisons.lo: nir/$(am__dirstamp) \
-	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_opt_peephole_select.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_opt_remove_phis.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_opt_trivial_continues.lo: nir/$(am__dirstamp) \
-	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_opt_undef.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_phi_builder.lo: nir/$(am__dirstamp) \
@@ -1701,7 +1710,7 @@ nir/nir_search.lo: nir/$(am__dirstamp) nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_split_var_copies.lo: nir/$(am__dirstamp) \
 	nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_sweep.lo: nir/$(am__dirstamp) nir/$(DEPDIR)/$(am__dirstamp)
-nir/nir_to_lcssa.lo: nir/$(am__dirstamp) nir/$(DEPDIR)/$(am__dirstamp)
+nir/nir_to_ssa.lo: nir/$(am__dirstamp) nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_validate.lo: nir/$(am__dirstamp) nir/$(DEPDIR)/$(am__dirstamp)
 nir/nir_worklist.lo: nir/$(am__dirstamp) nir/$(DEPDIR)/$(am__dirstamp)
 spirv/$(am__dirstamp):
@@ -1786,11 +1795,6 @@ glsl/tests/invalidate_locations_test.$(OBJEXT):  \
 	glsl/tests/$(DEPDIR)/$(am__dirstamp)
 glsl/tests/general_ir_test.$(OBJEXT): glsl/tests/$(am__dirstamp) \
 	glsl/tests/$(DEPDIR)/$(am__dirstamp)
-glsl/tests/lower_int64_test.$(OBJEXT): glsl/tests/$(am__dirstamp) \
-	glsl/tests/$(DEPDIR)/$(am__dirstamp)
-glsl/tests/opt_add_neg_to_sub_test.$(OBJEXT):  \
-	glsl/tests/$(am__dirstamp) \
-	glsl/tests/$(DEPDIR)/$(am__dirstamp)
 glsl/tests/varyings_test.$(OBJEXT): glsl/tests/$(am__dirstamp) \
 	glsl/tests/$(DEPDIR)/$(am__dirstamp)
 glsl/tests/general-ir-test$(EXEEXT): $(glsl_tests_general_ir_test_OBJECTS) $(glsl_tests_general_ir_test_DEPENDENCIES) $(EXTRA_glsl_tests_general_ir_test_DEPENDENCIES) glsl/tests/$(am__dirstamp)
@@ -1864,7 +1868,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/builtin_functions.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/builtin_types.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/builtin_variables.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/generate_ir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/cache.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/glsl_lexer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/glsl_parser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/glsl_parser_extras.Plo@am__quote@
@@ -1875,7 +1879,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/ir_array_refcount.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/ir_basic_block.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/ir_builder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/ir_builder_print_visitor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/ir_clone.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/ir_constant_expression.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/ir_equals.Plo@am__quote@
@@ -1911,7 +1914,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/lower_distance.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/lower_if_to_cond_assign.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/lower_instructions.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/lower_int64.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/lower_jumps.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/lower_mat_op_to_vec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/lower_named_interface_blocks.Plo@am__quote@
@@ -1960,7 +1962,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/opt_vectorize.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/propagate_invariance.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/s_expression.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/shader_cache.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/standalone.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/standalone_scaffolding.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/$(DEPDIR)/test.Po@am__quote@
@@ -1976,8 +1977,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/general_ir_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/glsl_tests_cache_test-cache_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/invalidate_locations_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/lower_int64_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/opt_add_neg_to_sub_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/sampler_types_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/set_uniform_initializer_tests.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/uniform_initializer_utils.Po@am__quote@
@@ -1994,22 +1993,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_instr_set.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_intrinsics.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_liveness.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_loop_analyze.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_64bit_packing.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_alu_to_scalar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_atomics.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_bitmap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_clamp_color_outputs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_clip.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_clip_cull_distance_arrays.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_constant_initializers.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_double_ops.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_double_packing.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_drawpixels.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_global_vars_to_local.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_gs_intrinsics.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_idiv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_indirect_derefs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_int64.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_io.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_io_to_scalar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_io_to_temporaries.Plo@am__quote@
@@ -2017,9 +2012,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_load_const_to_scalar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_locals_to_regs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_passthrough_edgeflags.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_patch_vertices.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_phis_to_scalar.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_regs_to_ssa.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_returns.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_samplers.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_lower_system_values.Plo@am__quote@
@@ -2038,19 +2031,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_algebraic.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_conditional_discard.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_constant_folding.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_copy_prop_vars.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_copy_propagate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_cse.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_dce.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_dead_cf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_gcm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_global_to_local.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_if.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_loop_unroll.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_move_comparisons.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_peephole_select.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_remove_phis.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_trivial_continues.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_opt_undef.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_phi_builder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_print.Plo@am__quote@
@@ -2060,7 +2048,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_search.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_split_var_copies.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_sweep.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_to_lcssa.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_to_ssa.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_validate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/nir_worklist.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nir/tests/$(DEPDIR)/nir_tests_control_flow_tests-control_flow_tests.Po@am__quote@
@@ -2550,12 +2538,6 @@ uninstall-am:
 @REGEN_SOURCES_TRUE@	$(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py strings > $@ || ($(RM) $@; false)
 
 clean-local:
-	$(RM) glsl/tests/lower_jumps/*.opt_test
-	$(RM) glsl/tests/lower_jumps/*.expected
-	$(RM) glsl/tests/lower_jumps/*.out
-	$(RM) glsl/tests/warnings/*.out
-	$(RM) glsl/glcpp/tests/*.out
-	$(RM) -r glsl/glcpp/tests/subtest*/
 	$(RM) -r subtest-cr subtest-cr-lf subtest-lf subtest-lf-cr
 
 dist-hook: