Merge Mesa 11.2.2

1 files changed, 272 insertions, 301 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/Makefile.in b/lib/mesa/src/gallium/auxiliary/Makefile.in
index ec48b2657..afc68d5b1 100644
--- a/lib/mesa/src/gallium/auxiliary/Makefile.in
+++ b/lib/mesa/src/gallium/auxiliary/Makefile.in
@@ -57,19 +57,20 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 @HAVE_DRISW_TRUE@am__append_1 = \
 @HAVE_DRISW_TRUE@	$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
 
-@HAVE_MESA_LLVM_TRUE@am__append_2 = \
-@HAVE_MESA_LLVM_TRUE@	$(LLVM_CFLAGS)
+@HAVE_DRISW_KMS_TRUE@am__append_2 = \
+@HAVE_DRISW_KMS_TRUE@	$(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la \
+@HAVE_DRISW_KMS_TRUE@	$(LIBDRM_LIBS)
 
 @HAVE_MESA_LLVM_TRUE@am__append_3 = \
+@HAVE_MESA_LLVM_TRUE@	$(LLVM_CFLAGS)
+
+@HAVE_MESA_LLVM_TRUE@am__append_4 = \
 @HAVE_MESA_LLVM_TRUE@	$(GALLIUM_CFLAGS) \
 @HAVE_MESA_LLVM_TRUE@	$(LLVM_CXXFLAGS)
 
-@HAVE_MESA_LLVM_TRUE@am__append_4 = \
+@HAVE_MESA_LLVM_TRUE@am__append_5 = \
 @HAVE_MESA_LLVM_TRUE@	$(GALLIVM_SOURCES)
 
-@HAVE_GALLIUM_STATIC_TARGETS_TRUE@@NEED_GALLIUM_VL_TRUE@am__append_5 = \
-@HAVE_GALLIUM_STATIC_TARGETS_TRUE@@NEED_GALLIUM_VL_TRUE@	-DGALLIUM_STATIC_TARGETS=1
-
 @NEED_GALLIUM_VL_TRUE@am__append_6 = libgalliumvl.la
 @NEED_GALLIUM_VL_TRUE@@NEED_GALLIUM_VL_WINSYS_TRUE@am__append_7 = libgalliumvlwinsys.la
 subdir = src/gallium/auxiliary
@@ -90,7 +91,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-libgallium_la_LIBADD =
+libgallium_la_DEPENDENCIES = libgallium_nir.la
 am__libgallium_la_SOURCES_DIST = cso_cache/cso_cache.c \
 	cso_cache/cso_cache.h cso_cache/cso_context.c \
 	cso_cache/cso_context.h cso_cache/cso_hash.c \
@@ -131,7 +132,8 @@ am__libgallium_la_SOURCES_DIST = cso_cache/cso_cache.c \
 	pipebuffer/pb_bufmgr_cache.c pipebuffer/pb_bufmgr_debug.c \
 	pipebuffer/pb_bufmgr.h pipebuffer/pb_bufmgr_mm.c \
 	pipebuffer/pb_bufmgr_ondemand.c pipebuffer/pb_bufmgr_pool.c \
-	pipebuffer/pb_bufmgr_slab.c pipebuffer/pb_validate.c \
+	pipebuffer/pb_bufmgr_slab.c pipebuffer/pb_cache.c \
+	pipebuffer/pb_cache.h pipebuffer/pb_validate.c \
 	pipebuffer/pb_validate.h postprocess/filters.h \
 	postprocess/postprocess.h postprocess/pp_celshade.c \
 	postprocess/pp_celshade.h postprocess/pp_colors.c \
@@ -146,16 +148,19 @@ am__libgallium_la_SOURCES_DIST = cso_cache/cso_cache.c \
 	rbug/rbug_shader.c rbug/rbug_shader.h rbug/rbug_texture.c \
 	rbug/rbug_texture.h rtasm/rtasm_cpu.c rtasm/rtasm_cpu.h \
 	rtasm/rtasm_execmem.c rtasm/rtasm_execmem.h \
-	rtasm/rtasm_x86sse.c rtasm/rtasm_x86sse.h tgsi/tgsi_build.c \
-	tgsi/tgsi_build.h tgsi/tgsi_dump.c tgsi/tgsi_dump.h \
-	tgsi/tgsi_exec.c tgsi/tgsi_exec.h tgsi/tgsi_info.c \
-	tgsi/tgsi_info.h tgsi/tgsi_iterate.c tgsi/tgsi_iterate.h \
-	tgsi/tgsi_lowering.c tgsi/tgsi_lowering.h \
+	rtasm/rtasm_x86sse.c rtasm/rtasm_x86sse.h tgsi/tgsi_aa_point.c \
+	tgsi/tgsi_aa_point.h tgsi/tgsi_build.c tgsi/tgsi_build.h \
+	tgsi/tgsi_dump.c tgsi/tgsi_dump.h tgsi/tgsi_exec.c \
+	tgsi/tgsi_exec.h tgsi/tgsi_emulate.c tgsi/tgsi_emulate.h \
+	tgsi/tgsi_info.c tgsi/tgsi_info.h tgsi/tgsi_iterate.c \
+	tgsi/tgsi_iterate.h tgsi/tgsi_lowering.c tgsi/tgsi_lowering.h \
 	tgsi/tgsi_opcode_tmp.h tgsi/tgsi_parse.c tgsi/tgsi_parse.h \
+	tgsi/tgsi_point_sprite.c tgsi/tgsi_point_sprite.h \
 	tgsi/tgsi_sanity.c tgsi/tgsi_sanity.h tgsi/tgsi_scan.c \
 	tgsi/tgsi_scan.h tgsi/tgsi_strings.c tgsi/tgsi_strings.h \
 	tgsi/tgsi_text.c tgsi/tgsi_text.h tgsi/tgsi_transform.c \
-	tgsi/tgsi_transform.h tgsi/tgsi_ureg.c tgsi/tgsi_ureg.h \
+	tgsi/tgsi_transform.h tgsi/tgsi_two_side.c \
+	tgsi/tgsi_two_side.h tgsi/tgsi_ureg.c tgsi/tgsi_ureg.h \
 	tgsi/tgsi_util.c tgsi/tgsi_util.h translate/translate.c \
 	translate/translate.h translate/translate_cache.c \
 	translate/translate_cache.h translate/translate_generic.c \
@@ -164,36 +169,36 @@ am__libgallium_la_SOURCES_DIST = cso_cache/cso_cache.c \
 	util/u_blitter.c util/u_blitter.h util/u_box.h util/u_cache.c \
 	util/u_cache.h util/u_caps.c util/u_caps.h util/u_clear.h \
 	util/u_cpu_detect.c util/u_cpu_detect.h util/u_debug.c \
-	util/u_debug_describe.c util/u_debug_describe.h \
-	util/u_debug_flush.c util/u_debug_flush.h util/u_debug.h \
-	util/u_debug_memory.c util/u_debug_refcnt.c \
-	util/u_debug_refcnt.h util/u_debug_stack.c \
-	util/u_debug_stack.h util/u_debug_symbol.c \
-	util/u_debug_symbol.h util/u_dirty_flags.h \
-	util/u_dirty_surfaces.h util/u_dl.c util/u_dl.h util/u_draw.c \
-	util/u_draw.h util/u_draw_quad.c util/u_draw_quad.h \
-	util/u_dual_blend.h util/u_dump_defines.c util/u_dump.h \
-	util/u_dump_state.c util/u_dynarray.h util/u_fifo.h \
-	util/u_format.c util/u_format.h util/u_format_etc.c \
-	util/u_format_etc.h util/u_format_fake.c util/u_format_fake.h \
-	util/u_format_latc.c util/u_format_latc.h \
-	util/u_format_other.c util/u_format_other.h \
-	util/u_format_r11g11b10f.h util/u_format_rgb9e5.h \
-	util/u_format_rgtc.c util/u_format_rgtc.h util/u_format_s3tc.c \
-	util/u_format_s3tc.h util/u_format_tests.c \
-	util/u_format_tests.h util/u_format_yuv.c util/u_format_yuv.h \
-	util/u_format_zs.c util/u_format_zs.h util/u_framebuffer.c \
-	util/u_framebuffer.h util/u_gen_mipmap.c util/u_gen_mipmap.h \
-	util/u_half.h util/u_handle_table.c util/u_handle_table.h \
-	util/u_hash.c util/u_hash.h util/u_hash_table.c \
-	util/u_hash_table.h util/u_helpers.c util/u_helpers.h \
-	util/u_index_modify.c util/u_index_modify.h util/u_init.h \
-	util/u_inlines.h util/u_keymap.c util/u_keymap.h \
-	util/u_linear.c util/u_linear.h util/u_math.c util/u_math.h \
-	util/u_memory.h util/u_mm.c util/u_mm.h util/u_network.c \
-	util/u_network.h util/u_pack_color.h util/u_pointer.h \
-	util/u_prim.h util/u_pstipple.c util/u_pstipple.h \
-	util/u_range.h util/u_rect.h util/u_resource.c \
+	util/u_debug.h util/u_debug_describe.c util/u_debug_describe.h \
+	util/u_debug_flush.c util/u_debug_flush.h util/u_debug_image.c \
+	util/u_debug_image.h util/u_debug_memory.c \
+	util/u_debug_refcnt.c util/u_debug_refcnt.h \
+	util/u_debug_stack.c util/u_debug_stack.h \
+	util/u_debug_symbol.c util/u_debug_symbol.h \
+	util/u_dirty_flags.h util/u_dirty_surfaces.h util/u_dl.c \
+	util/u_dl.h util/u_draw.c util/u_draw.h util/u_draw_quad.c \
+	util/u_draw_quad.h util/u_dual_blend.h util/u_dump_defines.c \
+	util/u_dump.h util/u_dump_state.c util/u_dynarray.h \
+	util/u_fifo.h util/u_format.c util/u_format.h \
+	util/u_format_etc.c util/u_format_etc.h util/u_format_latc.c \
+	util/u_format_latc.h util/u_format_other.c \
+	util/u_format_other.h util/u_format_r11g11b10f.h \
+	util/u_format_rgb9e5.h util/u_format_rgtc.c \
+	util/u_format_rgtc.h util/u_format_s3tc.c util/u_format_s3tc.h \
+	util/u_format_tests.c util/u_format_tests.h \
+	util/u_format_yuv.c util/u_format_yuv.h util/u_format_zs.c \
+	util/u_format_zs.h util/u_framebuffer.c util/u_framebuffer.h \
+	util/u_gen_mipmap.c util/u_gen_mipmap.h util/u_half.h \
+	util/u_handle_table.c util/u_handle_table.h util/u_hash.c \
+	util/u_hash.h util/u_hash_table.c util/u_hash_table.h \
+	util/u_helpers.c util/u_helpers.h util/u_index_modify.c \
+	util/u_index_modify.h util/u_inlines.h util/u_keymap.c \
+	util/u_keymap.h util/u_linear.c util/u_linear.h util/u_math.c \
+	util/u_math.h util/u_memory.h util/u_mm.c util/u_mm.h \
+	util/u_network.c util/u_network.h util/u_pack_color.h \
+	util/u_pointer.h util/u_prim.h util/u_prim_restart.c \
+	util/u_prim_restart.h util/u_pstipple.c util/u_pstipple.h \
+	util/u_pwr8.h util/u_range.h util/u_rect.h util/u_resource.c \
 	util/u_resource.h util/u_ringbuffer.c util/u_ringbuffer.h \
 	util/u_sampler.c util/u_sampler.h util/u_simple_shaders.c \
 	util/u_simple_shaders.h util/u_slab.c util/u_slab.h \
@@ -204,39 +209,40 @@ am__libgallium_la_SOURCES_DIST = cso_cache/cso_cache.c \
 	util/u_tests.h util/u_texture.c util/u_texture.h util/u_tile.c \
 	util/u_tile.h util/u_time.h util/u_transfer.c \
 	util/u_transfer.h util/u_upload_mgr.c util/u_upload_mgr.h \
-	util/u_vbuf.c util/u_vbuf.h util/u_video.h nir/tgsi_to_nir.c \
-	nir/tgsi_to_nir.h indices/u_indices_gen.c \
-	indices/u_unfilled_gen.c util/u_format_table.c \
-	gallivm/lp_bld_arit.c gallivm/lp_bld_arit.h \
-	gallivm/lp_bld_arit_overflow.c gallivm/lp_bld_arit_overflow.h \
-	gallivm/lp_bld_assert.c gallivm/lp_bld_assert.h \
-	gallivm/lp_bld_bitarit.c gallivm/lp_bld_bitarit.h \
-	gallivm/lp_bld_const.c gallivm/lp_bld_const.h \
-	gallivm/lp_bld_conv.c gallivm/lp_bld_conv.h \
-	gallivm/lp_bld_debug.cpp gallivm/lp_bld_debug.h \
-	gallivm/lp_bld_flow.c gallivm/lp_bld_flow.h \
-	gallivm/lp_bld_format_aos_array.c gallivm/lp_bld_format_aos.c \
-	gallivm/lp_bld_format_float.c gallivm/lp_bld_format.h \
-	gallivm/lp_bld_format_soa.c gallivm/lp_bld_format_srgb.c \
-	gallivm/lp_bld_format_yuv.c gallivm/lp_bld_gather.c \
-	gallivm/lp_bld_gather.h gallivm/lp_bld.h gallivm/lp_bld_init.c \
-	gallivm/lp_bld_init.h gallivm/lp_bld_intr.c \
-	gallivm/lp_bld_intr.h gallivm/lp_bld_limits.h \
-	gallivm/lp_bld_logic.c gallivm/lp_bld_logic.h \
-	gallivm/lp_bld_misc.cpp gallivm/lp_bld_misc.h \
-	gallivm/lp_bld_pack.c gallivm/lp_bld_pack.h \
-	gallivm/lp_bld_printf.c gallivm/lp_bld_printf.h \
-	gallivm/lp_bld_quad.c gallivm/lp_bld_quad.h \
-	gallivm/lp_bld_sample_aos.c gallivm/lp_bld_sample_aos.h \
-	gallivm/lp_bld_sample.c gallivm/lp_bld_sample.h \
-	gallivm/lp_bld_sample_soa.c gallivm/lp_bld_struct.c \
-	gallivm/lp_bld_struct.h gallivm/lp_bld_swizzle.c \
-	gallivm/lp_bld_swizzle.h gallivm/lp_bld_tgsi_action.c \
-	gallivm/lp_bld_tgsi_action.h gallivm/lp_bld_tgsi_aos.c \
-	gallivm/lp_bld_tgsi.c gallivm/lp_bld_tgsi.h \
-	gallivm/lp_bld_tgsi_info.c gallivm/lp_bld_tgsi_soa.c \
-	gallivm/lp_bld_type.c gallivm/lp_bld_type.h draw/draw_llvm.c \
-	draw/draw_llvm.h draw/draw_llvm_sample.c \
+	util/u_vbuf.c util/u_vbuf.h util/u_video.h \
+	indices/u_indices_gen.c indices/u_unfilled_gen.c \
+	util/u_format_table.c gallivm/lp_bld_arit.c \
+	gallivm/lp_bld_arit.h gallivm/lp_bld_arit_overflow.c \
+	gallivm/lp_bld_arit_overflow.h gallivm/lp_bld_assert.c \
+	gallivm/lp_bld_assert.h gallivm/lp_bld_bitarit.c \
+	gallivm/lp_bld_bitarit.h gallivm/lp_bld_const.c \
+	gallivm/lp_bld_const.h gallivm/lp_bld_conv.c \
+	gallivm/lp_bld_conv.h gallivm/lp_bld_debug.cpp \
+	gallivm/lp_bld_debug.h gallivm/lp_bld_flow.c \
+	gallivm/lp_bld_flow.h gallivm/lp_bld_format_aos_array.c \
+	gallivm/lp_bld_format_aos.c gallivm/lp_bld_format_cached.c \
+	gallivm/lp_bld_format_float.c gallivm/lp_bld_format.c \
+	gallivm/lp_bld_format.h gallivm/lp_bld_format_soa.c \
+	gallivm/lp_bld_format_srgb.c gallivm/lp_bld_format_yuv.c \
+	gallivm/lp_bld_gather.c gallivm/lp_bld_gather.h \
+	gallivm/lp_bld.h gallivm/lp_bld_init.c gallivm/lp_bld_init.h \
+	gallivm/lp_bld_intr.c gallivm/lp_bld_intr.h \
+	gallivm/lp_bld_limits.h gallivm/lp_bld_logic.c \
+	gallivm/lp_bld_logic.h gallivm/lp_bld_misc.cpp \
+	gallivm/lp_bld_misc.h gallivm/lp_bld_pack.c \
+	gallivm/lp_bld_pack.h gallivm/lp_bld_printf.c \
+	gallivm/lp_bld_printf.h gallivm/lp_bld_quad.c \
+	gallivm/lp_bld_quad.h gallivm/lp_bld_sample_aos.c \
+	gallivm/lp_bld_sample_aos.h gallivm/lp_bld_sample.c \
+	gallivm/lp_bld_sample.h gallivm/lp_bld_sample_soa.c \
+	gallivm/lp_bld_struct.c gallivm/lp_bld_struct.h \
+	gallivm/lp_bld_swizzle.c gallivm/lp_bld_swizzle.h \
+	gallivm/lp_bld_tgsi_action.c gallivm/lp_bld_tgsi_action.h \
+	gallivm/lp_bld_tgsi_aos.c gallivm/lp_bld_tgsi.c \
+	gallivm/lp_bld_tgsi.h gallivm/lp_bld_tgsi_info.c \
+	gallivm/lp_bld_tgsi_soa.c gallivm/lp_bld_type.c \
+	gallivm/lp_bld_type.h draw/draw_llvm.c draw/draw_llvm.h \
+	draw/draw_llvm_sample.c \
 	draw/draw_pt_fetch_shade_pipeline_llvm.c draw/draw_vs_llvm.c
 am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = cso_cache/cso_cache.lo cso_cache/cso_context.lo \
@@ -263,49 +269,51 @@ am__objects_1 = cso_cache/cso_cache.lo cso_cache/cso_context.lo \
 	pipebuffer/pb_bufmgr_cache.lo pipebuffer/pb_bufmgr_debug.lo \
 	pipebuffer/pb_bufmgr_mm.lo pipebuffer/pb_bufmgr_ondemand.lo \
 	pipebuffer/pb_bufmgr_pool.lo pipebuffer/pb_bufmgr_slab.lo \
-	pipebuffer/pb_validate.lo postprocess/pp_celshade.lo \
-	postprocess/pp_colors.lo postprocess/pp_init.lo \
-	postprocess/pp_mlaa.lo postprocess/pp_program.lo \
-	postprocess/pp_run.lo rbug/rbug_connection.lo \
-	rbug/rbug_context.lo rbug/rbug_core.lo rbug/rbug_demarshal.lo \
-	rbug/rbug_shader.lo rbug/rbug_texture.lo rtasm/rtasm_cpu.lo \
-	rtasm/rtasm_execmem.lo rtasm/rtasm_x86sse.lo \
-	tgsi/tgsi_build.lo tgsi/tgsi_dump.lo tgsi/tgsi_exec.lo \
+	pipebuffer/pb_cache.lo pipebuffer/pb_validate.lo \
+	postprocess/pp_celshade.lo postprocess/pp_colors.lo \
+	postprocess/pp_init.lo postprocess/pp_mlaa.lo \
+	postprocess/pp_program.lo postprocess/pp_run.lo \
+	rbug/rbug_connection.lo rbug/rbug_context.lo rbug/rbug_core.lo \
+	rbug/rbug_demarshal.lo rbug/rbug_shader.lo \
+	rbug/rbug_texture.lo rtasm/rtasm_cpu.lo rtasm/rtasm_execmem.lo \
+	rtasm/rtasm_x86sse.lo tgsi/tgsi_aa_point.lo tgsi/tgsi_build.lo \
+	tgsi/tgsi_dump.lo tgsi/tgsi_exec.lo tgsi/tgsi_emulate.lo \
 	tgsi/tgsi_info.lo tgsi/tgsi_iterate.lo tgsi/tgsi_lowering.lo \
-	tgsi/tgsi_parse.lo tgsi/tgsi_sanity.lo tgsi/tgsi_scan.lo \
-	tgsi/tgsi_strings.lo tgsi/tgsi_text.lo tgsi/tgsi_transform.lo \
+	tgsi/tgsi_parse.lo tgsi/tgsi_point_sprite.lo \
+	tgsi/tgsi_sanity.lo tgsi/tgsi_scan.lo tgsi/tgsi_strings.lo \
+	tgsi/tgsi_text.lo tgsi/tgsi_transform.lo tgsi/tgsi_two_side.lo \
 	tgsi/tgsi_ureg.lo tgsi/tgsi_util.lo translate/translate.lo \
 	translate/translate_cache.lo translate/translate_generic.lo \
 	translate/translate_sse.lo util/u_bitmask.lo util/u_blit.lo \
 	util/u_blitter.lo util/u_cache.lo util/u_caps.lo \
 	util/u_cpu_detect.lo util/u_debug.lo util/u_debug_describe.lo \
-	util/u_debug_flush.lo util/u_debug_memory.lo \
-	util/u_debug_refcnt.lo util/u_debug_stack.lo \
-	util/u_debug_symbol.lo util/u_dl.lo util/u_draw.lo \
-	util/u_draw_quad.lo util/u_dump_defines.lo \
+	util/u_debug_flush.lo util/u_debug_image.lo \
+	util/u_debug_memory.lo util/u_debug_refcnt.lo \
+	util/u_debug_stack.lo util/u_debug_symbol.lo util/u_dl.lo \
+	util/u_draw.lo util/u_draw_quad.lo util/u_dump_defines.lo \
 	util/u_dump_state.lo util/u_format.lo util/u_format_etc.lo \
-	util/u_format_fake.lo util/u_format_latc.lo \
-	util/u_format_other.lo util/u_format_rgtc.lo \
-	util/u_format_s3tc.lo util/u_format_tests.lo \
-	util/u_format_yuv.lo util/u_format_zs.lo util/u_framebuffer.lo \
-	util/u_gen_mipmap.lo util/u_handle_table.lo util/u_hash.lo \
-	util/u_hash_table.lo util/u_helpers.lo util/u_index_modify.lo \
-	util/u_keymap.lo util/u_linear.lo util/u_math.lo util/u_mm.lo \
-	util/u_network.lo util/u_pstipple.lo util/u_resource.lo \
+	util/u_format_latc.lo util/u_format_other.lo \
+	util/u_format_rgtc.lo util/u_format_s3tc.lo \
+	util/u_format_tests.lo util/u_format_yuv.lo \
+	util/u_format_zs.lo util/u_framebuffer.lo util/u_gen_mipmap.lo \
+	util/u_handle_table.lo util/u_hash.lo util/u_hash_table.lo \
+	util/u_helpers.lo util/u_index_modify.lo util/u_keymap.lo \
+	util/u_linear.lo util/u_math.lo util/u_mm.lo util/u_network.lo \
+	util/u_prim_restart.lo util/u_pstipple.lo util/u_resource.lo \
 	util/u_ringbuffer.lo util/u_sampler.lo \
 	util/u_simple_shaders.lo util/u_slab.lo util/u_staging.lo \
 	util/u_suballoc.lo util/u_surface.lo util/u_surfaces.lo \
 	util/u_tests.lo util/u_texture.lo util/u_tile.lo \
 	util/u_transfer.lo util/u_upload_mgr.lo util/u_vbuf.lo
-am__objects_2 = nir/tgsi_to_nir.lo
-am__objects_3 = indices/u_indices_gen.lo indices/u_unfilled_gen.lo \
+am__objects_2 = indices/u_indices_gen.lo indices/u_unfilled_gen.lo \
 	util/u_format_table.lo
-am__objects_4 = gallivm/lp_bld_arit.lo gallivm/lp_bld_arit_overflow.lo \
+am__objects_3 = gallivm/lp_bld_arit.lo gallivm/lp_bld_arit_overflow.lo \
 	gallivm/lp_bld_assert.lo gallivm/lp_bld_bitarit.lo \
 	gallivm/lp_bld_const.lo gallivm/lp_bld_conv.lo \
 	gallivm/lp_bld_debug.lo gallivm/lp_bld_flow.lo \
 	gallivm/lp_bld_format_aos_array.lo \
-	gallivm/lp_bld_format_aos.lo gallivm/lp_bld_format_float.lo \
+	gallivm/lp_bld_format_aos.lo gallivm/lp_bld_format_cached.lo \
+	gallivm/lp_bld_format_float.lo gallivm/lp_bld_format.lo \
 	gallivm/lp_bld_format_soa.lo gallivm/lp_bld_format_srgb.lo \
 	gallivm/lp_bld_format_yuv.lo gallivm/lp_bld_gather.lo \
 	gallivm/lp_bld_init.lo gallivm/lp_bld_intr.lo \
@@ -319,14 +327,22 @@ am__objects_4 = gallivm/lp_bld_arit.lo gallivm/lp_bld_arit_overflow.lo \
 	gallivm/lp_bld_tgsi_soa.lo gallivm/lp_bld_type.lo \
 	draw/draw_llvm.lo draw/draw_llvm_sample.lo \
 	draw/draw_pt_fetch_shade_pipeline_llvm.lo draw/draw_vs_llvm.lo
-@HAVE_MESA_LLVM_TRUE@am__objects_5 = $(am__objects_4)
+@HAVE_MESA_LLVM_TRUE@am__objects_4 = $(am__objects_3)
 am_libgallium_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
-	$(am__objects_3) $(am__objects_5)
+	$(am__objects_4)
 libgallium_la_OBJECTS = $(am_libgallium_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+libgallium_nir_la_LIBADD =
+am__objects_5 = nir/libgallium_nir_la-tgsi_to_nir.lo
+am_libgallium_nir_la_OBJECTS = $(am__objects_5)
+libgallium_nir_la_OBJECTS = $(am_libgallium_nir_la_OBJECTS)
+libgallium_nir_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libgallium_nir_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
 libgalliumvl_la_LIBADD =
 am__libgalliumvl_la_SOURCES_DIST = vl/vl_compositor.c \
 	vl/vl_compositor.h vl/vl_csc.c vl/vl_csc.h vl/vl_decoder.c \
@@ -363,8 +379,10 @@ am__objects_7 = vl/vl_stubs.lo
 am_libgalliumvl_stub_la_OBJECTS = $(am__objects_7)
 libgalliumvl_stub_la_OBJECTS = $(am_libgalliumvl_stub_la_OBJECTS)
 libgalliumvlwinsys_la_LIBADD =
-am__libgalliumvlwinsys_la_SOURCES_DIST = vl/vl_winsys_dri.c
-am__objects_8 = vl/libgalliumvlwinsys_la-vl_winsys_dri.lo
+am__libgalliumvlwinsys_la_SOURCES_DIST = vl/vl_winsys_dri.c \
+	vl/vl_winsys_drm.c
+am__objects_8 = vl/libgalliumvlwinsys_la-vl_winsys_dri.lo \
+	vl/libgalliumvlwinsys_la-vl_winsys_drm.lo
 @NEED_GALLIUM_VL_TRUE@@NEED_GALLIUM_VL_WINSYS_TRUE@am_libgalliumvlwinsys_la_OBJECTS = $(am__objects_8)
 libgalliumvlwinsys_la_OBJECTS = $(am_libgalliumvlwinsys_la_OBJECTS)
 libgalliumvlwinsys_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -424,59 +442,22 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(libgallium_la_SOURCES) $(libgalliumvl_la_SOURCES) \
-	$(libgalliumvl_stub_la_SOURCES) \
+SOURCES = $(libgallium_la_SOURCES) $(libgallium_nir_la_SOURCES) \
+	$(libgalliumvl_la_SOURCES) $(libgalliumvl_stub_la_SOURCES) \
 	$(libgalliumvlwinsys_la_SOURCES)
 DIST_SOURCES = $(am__libgallium_la_SOURCES_DIST) \
+	$(libgallium_nir_la_SOURCES) \
 	$(am__libgalliumvl_la_SOURCES_DIST) \
 	$(libgalliumvl_stub_la_SOURCES) \
 	$(am__libgalliumvlwinsys_la_SOURCES_DIST)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = pipe-loader
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMDGPU_CFLAGS = @AMDGPU_CFLAGS@
 AMDGPU_LIBS = @AMDGPU_LIBS@
@@ -576,6 +557,8 @@ LIBELF_CFLAGS = @LIBELF_CFLAGS@
 LIBELF_LIBS = @LIBELF_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBSHA1_CFLAGS = @LIBSHA1_CFLAGS@
+LIBSHA1_LIBS = @LIBSHA1_LIBS@
 LIBTOOL = @LIBTOOL@
 LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
 LIBUDEV_LIBS = @LIBUDEV_LIBS@
@@ -598,8 +581,6 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MESA_LLVM = @MESA_LLVM@
 MKDIR_P = @MKDIR_P@
-MSVC2008_COMPAT_CFLAGS = @MSVC2008_COMPAT_CFLAGS@
-MSVC2008_COMPAT_CXXFLAGS = @MSVC2008_COMPAT_CXXFLAGS@
 MSVC2013_COMPAT_CFLAGS = @MSVC2013_COMPAT_CFLAGS@
 MSVC2013_COMPAT_CXXFLAGS = @MSVC2013_COMPAT_CXXFLAGS@
 NINE_MAJOR = @NINE_MAJOR@
@@ -619,6 +600,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@
@@ -643,6 +626,7 @@ PRESENTPROTO_LIBS = @PRESENTPROTO_LIBS@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+PWR8_CFLAGS = @PWR8_CFLAGS@
 PYTHON2 = @PYTHON2@
 RADEON_CFLAGS = @RADEON_CFLAGS@
 RADEON_LIBS = @RADEON_LIBS@
@@ -652,7 +636,11 @@ 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@
 SSE41_CFLAGS = @SSE41_CFLAGS@
 STRIP = @STRIP@
 VA_CFLAGS = @VA_CFLAGS@
@@ -683,6 +671,8 @@ XA_TINY = @XA_TINY@
 XA_VERSION = @XA_VERSION@
 XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@
 XCB_DRI2_LIBS = @XCB_DRI2_LIBS@
+XCB_DRI3_CFLAGS = @XCB_DRI3_CFLAGS@
+XCB_DRI3_LIBS = @XCB_DRI3_LIBS@
 XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
 XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
 XLIBGL_CFLAGS = @XLIBGL_CFLAGS@
@@ -754,7 +744,6 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@HAVE_LOADER_GALLIUM_TRUE@SUBDIRS := pipe-loader
 C_SOURCES := \
 	cso_cache/cso_cache.c \
 	cso_cache/cso_cache.h \
@@ -850,6 +839,8 @@ C_SOURCES := \
 	pipebuffer/pb_bufmgr_ondemand.c \
 	pipebuffer/pb_bufmgr_pool.c \
 	pipebuffer/pb_bufmgr_slab.c \
+	pipebuffer/pb_cache.c \
+	pipebuffer/pb_cache.h \
 	pipebuffer/pb_validate.c \
 	pipebuffer/pb_validate.h \
 	postprocess/filters.h \
@@ -886,12 +877,16 @@ C_SOURCES := \
 	rtasm/rtasm_execmem.h \
 	rtasm/rtasm_x86sse.c \
 	rtasm/rtasm_x86sse.h \
+	tgsi/tgsi_aa_point.c \
+	tgsi/tgsi_aa_point.h \
 	tgsi/tgsi_build.c \
 	tgsi/tgsi_build.h \
 	tgsi/tgsi_dump.c \
 	tgsi/tgsi_dump.h \
 	tgsi/tgsi_exec.c \
 	tgsi/tgsi_exec.h \
+	tgsi/tgsi_emulate.c \
+	tgsi/tgsi_emulate.h \
 	tgsi/tgsi_info.c \
 	tgsi/tgsi_info.h \
 	tgsi/tgsi_iterate.c \
@@ -901,6 +896,8 @@ C_SOURCES := \
 	tgsi/tgsi_opcode_tmp.h \
 	tgsi/tgsi_parse.c \
 	tgsi/tgsi_parse.h \
+	tgsi/tgsi_point_sprite.c \
+	tgsi/tgsi_point_sprite.h \
 	tgsi/tgsi_sanity.c \
 	tgsi/tgsi_sanity.h \
 	tgsi/tgsi_scan.c \
@@ -911,6 +908,8 @@ C_SOURCES := \
 	tgsi/tgsi_text.h \
 	tgsi/tgsi_transform.c \
 	tgsi/tgsi_transform.h \
+	tgsi/tgsi_two_side.c \
+	tgsi/tgsi_two_side.h \
 	tgsi/tgsi_ureg.c \
 	tgsi/tgsi_ureg.h \
 	tgsi/tgsi_util.c \
@@ -938,11 +937,13 @@ C_SOURCES := \
 	util/u_cpu_detect.c \
 	util/u_cpu_detect.h \
 	util/u_debug.c \
+	util/u_debug.h \
 	util/u_debug_describe.c \
 	util/u_debug_describe.h \
 	util/u_debug_flush.c \
 	util/u_debug_flush.h \
-	util/u_debug.h \
+	util/u_debug_image.c \
+	util/u_debug_image.h \
 	util/u_debug_memory.c \
 	util/u_debug_refcnt.c \
 	util/u_debug_refcnt.h \
@@ -968,8 +969,6 @@ C_SOURCES := \
 	util/u_format.h \
 	util/u_format_etc.c \
 	util/u_format_etc.h \
-	util/u_format_fake.c \
-	util/u_format_fake.h \
 	util/u_format_latc.c \
 	util/u_format_latc.h \
 	util/u_format_other.c \
@@ -1001,7 +1000,6 @@ C_SOURCES := \
 	util/u_helpers.h \
 	util/u_index_modify.c \
 	util/u_index_modify.h \
-	util/u_init.h \
 	util/u_inlines.h \
 	util/u_keymap.c \
 	util/u_keymap.h \
@@ -1017,8 +1015,11 @@ C_SOURCES := \
 	util/u_pack_color.h \
 	util/u_pointer.h \
 	util/u_prim.h \
+	util/u_prim_restart.c \
+	util/u_prim_restart.h \
 	util/u_pstipple.c \
 	util/u_pstipple.h \
+	util/u_pwr8.h \
 	util/u_range.h \
 	util/u_rect.h \
 	util/u_resource.c \
@@ -1097,7 +1098,8 @@ VL_SOURCES := \
 
 # XXX: Nuke this as our dri targets no longer depend on VL.
 VL_WINSYS_SOURCES := \
-	vl/vl_winsys_dri.c
+	vl/vl_winsys_dri.c \
+	vl/vl_winsys_drm.c
 
 VL_STUB_SOURCES := \
 	vl/vl_stubs.c
@@ -1126,7 +1128,9 @@ GALLIVM_SOURCES := \
 	gallivm/lp_bld_flow.h \
 	gallivm/lp_bld_format_aos_array.c \
 	gallivm/lp_bld_format_aos.c \
+	gallivm/lp_bld_format_cached.c \
 	gallivm/lp_bld_format_float.c \
+	gallivm/lp_bld_format.c \
 	gallivm/lp_bld_format.h \
 	gallivm/lp_bld_format_soa.c \
 	gallivm/lp_bld_format_srgb.c \
@@ -1237,27 +1241,39 @@ GALLIUM_WINSYS_CFLAGS = \
 GALLIUM_PIPE_LOADER_WINSYS_LIBS =  \
 	$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
 	$(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la \
-	$(am__append_1)
-noinst_LTLIBRARIES = libgallium.la libgalliumvl_stub.la \
-	$(am__append_6) $(am__append_7)
-AM_CFLAGS = -I$(top_srcdir)/src/loader -I$(top_builddir)/src/glsl/nir \
+	$(am__append_1) $(am__append_2)
+noinst_LTLIBRARIES = libgallium_nir.la libgallium.la \
+	libgalliumvl_stub.la $(am__append_6) $(am__append_7)
+AM_CFLAGS = -I$(top_srcdir)/src/loader \
 	-I$(top_srcdir)/src/gallium/auxiliary/util $(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CFLAGS) $(MSVC2008_COMPAT_CXXFLAGS) \
-	$(am__append_2)
-AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) $(MSVC2008_COMPAT_CXXFLAGS) \
-	$(am__append_3)
-libgallium_la_SOURCES = $(C_SOURCES) $(NIR_SOURCES) \
-	$(GENERATED_SOURCES) $(am__append_4)
+	$(VISIBILITY_CFLAGS) $(MSVC2013_COMPAT_CFLAGS) $(am__append_3)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) $(MSVC2013_COMPAT_CXXFLAGS) \
+	$(am__append_4)
+libgallium_nir_la_SOURCES = \
+	$(NIR_SOURCES)
+
+libgallium_nir_la_CFLAGS = \
+	-I$(top_builddir)/src/compiler/nir \
+	$(GALLIUM_CFLAGS) \
+	$(VISIBILITY_CFLAGS) \
+	$(MSVC2013_COMPAT_CFLAGS)
+
+libgallium_la_SOURCES = $(C_SOURCES) $(GENERATED_SOURCES) \
+	$(am__append_5)
+libgallium_la_LIBADD = \
+	libgallium_nir.la
+
 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
 @REGEN_SOURCES_TRUE@PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
 libgalliumvl_stub_la_SOURCES = \
 	$(VL_STUB_SOURCES)
 
-@NEED_GALLIUM_VL_TRUE@COMMON_VL_CFLAGS = $(AM_CFLAGS) $(VL_CFLAGS) \
-@NEED_GALLIUM_VL_TRUE@	$(DRI2PROTO_CFLAGS) $(LIBDRM_CFLAGS) \
-@NEED_GALLIUM_VL_TRUE@	$(GALLIUM_PIPE_LOADER_DEFINES) \
-@NEED_GALLIUM_VL_TRUE@	-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \
-@NEED_GALLIUM_VL_TRUE@	$(am__append_5)
+@NEED_GALLIUM_VL_TRUE@COMMON_VL_CFLAGS = \
+@NEED_GALLIUM_VL_TRUE@	$(AM_CFLAGS) \
+@NEED_GALLIUM_VL_TRUE@	$(VL_CFLAGS) \
+@NEED_GALLIUM_VL_TRUE@	$(DRI2PROTO_CFLAGS) \
+@NEED_GALLIUM_VL_TRUE@	$(LIBDRM_CFLAGS)
+
 @NEED_GALLIUM_VL_TRUE@libgalliumvl_la_CFLAGS = \
 @NEED_GALLIUM_VL_TRUE@	$(COMMON_VL_CFLAGS)
 
@@ -1284,7 +1300,7 @@ EXTRA_DIST = \
 	util/u_format_parse.py \
 	util/u_format_table.py
 
-all: all-recursive
+all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
@@ -1464,6 +1480,8 @@ pipebuffer/pb_bufmgr_pool.lo: pipebuffer/$(am__dirstamp) \
 	pipebuffer/$(DEPDIR)/$(am__dirstamp)
 pipebuffer/pb_bufmgr_slab.lo: pipebuffer/$(am__dirstamp) \
 	pipebuffer/$(DEPDIR)/$(am__dirstamp)
+pipebuffer/pb_cache.lo: pipebuffer/$(am__dirstamp) \
+	pipebuffer/$(DEPDIR)/$(am__dirstamp)
 pipebuffer/pb_validate.lo: pipebuffer/$(am__dirstamp) \
 	pipebuffer/$(DEPDIR)/$(am__dirstamp)
 postprocess/$(am__dirstamp):
@@ -1519,10 +1537,14 @@ tgsi/$(am__dirstamp):
 tgsi/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) tgsi/$(DEPDIR)
 	@: > tgsi/$(DEPDIR)/$(am__dirstamp)
+tgsi/tgsi_aa_point.lo: tgsi/$(am__dirstamp) \
+	tgsi/$(DEPDIR)/$(am__dirstamp)
 tgsi/tgsi_build.lo: tgsi/$(am__dirstamp) \
 	tgsi/$(DEPDIR)/$(am__dirstamp)
 tgsi/tgsi_dump.lo: tgsi/$(am__dirstamp) tgsi/$(DEPDIR)/$(am__dirstamp)
 tgsi/tgsi_exec.lo: tgsi/$(am__dirstamp) tgsi/$(DEPDIR)/$(am__dirstamp)
+tgsi/tgsi_emulate.lo: tgsi/$(am__dirstamp) \
+	tgsi/$(DEPDIR)/$(am__dirstamp)
 tgsi/tgsi_info.lo: tgsi/$(am__dirstamp) tgsi/$(DEPDIR)/$(am__dirstamp)
 tgsi/tgsi_iterate.lo: tgsi/$(am__dirstamp) \
 	tgsi/$(DEPDIR)/$(am__dirstamp)
@@ -1530,6 +1552,8 @@ tgsi/tgsi_lowering.lo: tgsi/$(am__dirstamp) \
 	tgsi/$(DEPDIR)/$(am__dirstamp)
 tgsi/tgsi_parse.lo: tgsi/$(am__dirstamp) \
 	tgsi/$(DEPDIR)/$(am__dirstamp)
+tgsi/tgsi_point_sprite.lo: tgsi/$(am__dirstamp) \
+	tgsi/$(DEPDIR)/$(am__dirstamp)
 tgsi/tgsi_sanity.lo: tgsi/$(am__dirstamp) \
 	tgsi/$(DEPDIR)/$(am__dirstamp)
 tgsi/tgsi_scan.lo: tgsi/$(am__dirstamp) tgsi/$(DEPDIR)/$(am__dirstamp)
@@ -1538,6 +1562,8 @@ tgsi/tgsi_strings.lo: tgsi/$(am__dirstamp) \
 tgsi/tgsi_text.lo: tgsi/$(am__dirstamp) tgsi/$(DEPDIR)/$(am__dirstamp)
 tgsi/tgsi_transform.lo: tgsi/$(am__dirstamp) \
 	tgsi/$(DEPDIR)/$(am__dirstamp)
+tgsi/tgsi_two_side.lo: tgsi/$(am__dirstamp) \
+	tgsi/$(DEPDIR)/$(am__dirstamp)
 tgsi/tgsi_ureg.lo: tgsi/$(am__dirstamp) tgsi/$(DEPDIR)/$(am__dirstamp)
 tgsi/tgsi_util.lo: tgsi/$(am__dirstamp) tgsi/$(DEPDIR)/$(am__dirstamp)
 translate/$(am__dirstamp):
@@ -1572,6 +1598,8 @@ util/u_debug_describe.lo: util/$(am__dirstamp) \
 	util/$(DEPDIR)/$(am__dirstamp)
 util/u_debug_flush.lo: util/$(am__dirstamp) \
 	util/$(DEPDIR)/$(am__dirstamp)
+util/u_debug_image.lo: util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
 util/u_debug_memory.lo: util/$(am__dirstamp) \
 	util/$(DEPDIR)/$(am__dirstamp)
 util/u_debug_refcnt.lo: util/$(am__dirstamp) \
@@ -1591,8 +1619,6 @@ util/u_dump_state.lo: util/$(am__dirstamp) \
 util/u_format.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
 util/u_format_etc.lo: util/$(am__dirstamp) \
 	util/$(DEPDIR)/$(am__dirstamp)
-util/u_format_fake.lo: util/$(am__dirstamp) \
-	util/$(DEPDIR)/$(am__dirstamp)
 util/u_format_latc.lo: util/$(am__dirstamp) \
 	util/$(DEPDIR)/$(am__dirstamp)
 util/u_format_other.lo: util/$(am__dirstamp) \
@@ -1624,6 +1650,8 @@ util/u_linear.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
 util/u_math.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
 util/u_mm.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
 util/u_network.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/u_prim_restart.lo: util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
 util/u_pstipple.lo: util/$(am__dirstamp) \
 	util/$(DEPDIR)/$(am__dirstamp)
 util/u_resource.lo: util/$(am__dirstamp) \
@@ -1648,13 +1676,6 @@ util/u_transfer.lo: util/$(am__dirstamp) \
 util/u_upload_mgr.lo: util/$(am__dirstamp) \
 	util/$(DEPDIR)/$(am__dirstamp)
 util/u_vbuf.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
-nir/$(am__dirstamp):
-	@$(MKDIR_P) nir
-	@: > nir/$(am__dirstamp)
-nir/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) nir/$(DEPDIR)
-	@: > nir/$(DEPDIR)/$(am__dirstamp)
-nir/tgsi_to_nir.lo: nir/$(am__dirstamp) nir/$(DEPDIR)/$(am__dirstamp)
 indices/u_indices_gen.lo: indices/$(am__dirstamp) \
 	indices/$(DEPDIR)/$(am__dirstamp)
 indices/u_unfilled_gen.lo: indices/$(am__dirstamp) \
@@ -1687,8 +1708,12 @@ gallivm/lp_bld_format_aos_array.lo: gallivm/$(am__dirstamp) \
 	gallivm/$(DEPDIR)/$(am__dirstamp)
 gallivm/lp_bld_format_aos.lo: gallivm/$(am__dirstamp) \
 	gallivm/$(DEPDIR)/$(am__dirstamp)
+gallivm/lp_bld_format_cached.lo: gallivm/$(am__dirstamp) \
+	gallivm/$(DEPDIR)/$(am__dirstamp)
 gallivm/lp_bld_format_float.lo: gallivm/$(am__dirstamp) \
 	gallivm/$(DEPDIR)/$(am__dirstamp)
+gallivm/lp_bld_format.lo: gallivm/$(am__dirstamp) \
+	gallivm/$(DEPDIR)/$(am__dirstamp)
 gallivm/lp_bld_format_soa.lo: gallivm/$(am__dirstamp) \
 	gallivm/$(DEPDIR)/$(am__dirstamp)
 gallivm/lp_bld_format_srgb.lo: gallivm/$(am__dirstamp) \
@@ -1742,6 +1767,16 @@ draw/draw_vs_llvm.lo: draw/$(am__dirstamp) \
 	draw/$(DEPDIR)/$(am__dirstamp)
 libgallium.la: $(libgallium_la_OBJECTS) $(libgallium_la_DEPENDENCIES) $(EXTRA_libgallium_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(CXXLINK)  $(libgallium_la_OBJECTS) $(libgallium_la_LIBADD) $(LIBS)
+nir/$(am__dirstamp):
+	@$(MKDIR_P) nir
+	@: > nir/$(am__dirstamp)
+nir/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) nir/$(DEPDIR)
+	@: > nir/$(DEPDIR)/$(am__dirstamp)
+nir/libgallium_nir_la-tgsi_to_nir.lo: nir/$(am__dirstamp) \
+	nir/$(DEPDIR)/$(am__dirstamp)
+libgallium_nir.la: $(libgallium_nir_la_OBJECTS) $(libgallium_nir_la_DEPENDENCIES) $(EXTRA_libgallium_nir_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libgallium_nir_la_LINK)  $(libgallium_nir_la_OBJECTS) $(libgallium_nir_la_LIBADD) $(LIBS)
 vl/$(am__dirstamp):
 	@$(MKDIR_P) vl
 	@: > vl/$(am__dirstamp)
@@ -1781,6 +1816,8 @@ libgalliumvl_stub.la: $(libgalliumvl_stub_la_OBJECTS) $(libgalliumvl_stub_la_DEP
 	$(AM_V_CCLD)$(LINK)  $(libgalliumvl_stub_la_OBJECTS) $(libgalliumvl_stub_la_LIBADD) $(LIBS)
 vl/libgalliumvlwinsys_la-vl_winsys_dri.lo: vl/$(am__dirstamp) \
 	vl/$(DEPDIR)/$(am__dirstamp)
+vl/libgalliumvlwinsys_la-vl_winsys_drm.lo: vl/$(am__dirstamp) \
+	vl/$(DEPDIR)/$(am__dirstamp)
 libgalliumvlwinsys.la: $(libgalliumvlwinsys_la_OBJECTS) $(libgalliumvlwinsys_la_DEPENDENCIES) $(EXTRA_libgalliumvlwinsys_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgalliumvlwinsys_la_LINK) $(am_libgalliumvlwinsys_la_rpath) $(libgalliumvlwinsys_la_OBJECTS) $(libgalliumvlwinsys_la_LIBADD) $(LIBS)
 
@@ -1869,8 +1906,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gallivm/$(DEPDIR)/lp_bld_conv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gallivm/$(DEPDIR)/lp_bld_debug.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gallivm/$(DEPDIR)/lp_bld_flow.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gallivm/$(DEPDIR)/lp_bld_format.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gallivm/$(DEPDIR)/lp_bld_format_aos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gallivm/$(DEPDIR)/lp_bld_format_aos_array.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gallivm/$(DEPDIR)/lp_bld_format_cached.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gallivm/$(DEPDIR)/lp_bld_format_float.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gallivm/$(DEPDIR)/lp_bld_format_soa.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gallivm/$(DEPDIR)/lp_bld_format_srgb.Plo@am__quote@
@@ -1902,7 +1941,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@indices/$(DEPDIR)/u_indices_gen.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@indices/$(DEPDIR)/u_primconvert.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@indices/$(DEPDIR)/u_unfilled_gen.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/tgsi_to_nir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@nir/$(DEPDIR)/libgallium_nir_la-tgsi_to_nir.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/os_misc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/os_process.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@os/$(DEPDIR)/os_time.Plo@am__quote@
@@ -1915,6 +1954,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@pipebuffer/$(DEPDIR)/pb_bufmgr_ondemand.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pipebuffer/$(DEPDIR)/pb_bufmgr_pool.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pipebuffer/$(DEPDIR)/pb_bufmgr_slab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pipebuffer/$(DEPDIR)/pb_cache.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pipebuffer/$(DEPDIR)/pb_validate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@postprocess/$(DEPDIR)/pp_celshade.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@postprocess/$(DEPDIR)/pp_colors.Plo@am__quote@
@@ -1931,18 +1971,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@rtasm/$(DEPDIR)/rtasm_cpu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@rtasm/$(DEPDIR)/rtasm_execmem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@rtasm/$(DEPDIR)/rtasm_x86sse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_aa_point.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_build.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_dump.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_emulate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_exec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_info.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_iterate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_lowering.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_point_sprite.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_sanity.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_scan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_strings.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_text.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_transform.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_two_side.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_ureg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tgsi/$(DEPDIR)/tgsi_util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@translate/$(DEPDIR)/translate.Plo@am__quote@
@@ -1958,6 +2002,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_debug.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_debug_describe.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_debug_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_debug_image.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_debug_memory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_debug_refcnt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_debug_stack.Plo@am__quote@
@@ -1969,7 +2014,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_dump_state.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_format.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_format_etc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_format_fake.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_format_latc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_format_other.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_format_rgtc.Plo@am__quote@
@@ -1990,6 +2034,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_math.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_mm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_network.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_prim_restart.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_pstipple.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_resource.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/u_ringbuffer.Plo@am__quote@
@@ -2020,6 +2065,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@vl/$(DEPDIR)/libgalliumvl_la-vl_video_buffer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@vl/$(DEPDIR)/libgalliumvl_la-vl_zscan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@vl/$(DEPDIR)/libgalliumvlwinsys_la-vl_winsys_dri.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@vl/$(DEPDIR)/libgalliumvlwinsys_la-vl_winsys_drm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@vl/$(DEPDIR)/vl_stubs.Plo@am__quote@
 
 .c.o:
@@ -2046,6 +2092,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+nir/libgallium_nir_la-tgsi_to_nir.lo: nir/tgsi_to_nir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgallium_nir_la_CFLAGS) $(CFLAGS) -MT nir/libgallium_nir_la-tgsi_to_nir.lo -MD -MP -MF nir/$(DEPDIR)/libgallium_nir_la-tgsi_to_nir.Tpo -c -o nir/libgallium_nir_la-tgsi_to_nir.lo `test -f 'nir/tgsi_to_nir.c' || echo '$(srcdir)/'`nir/tgsi_to_nir.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) nir/$(DEPDIR)/libgallium_nir_la-tgsi_to_nir.Tpo nir/$(DEPDIR)/libgallium_nir_la-tgsi_to_nir.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nir/tgsi_to_nir.c' object='nir/libgallium_nir_la-tgsi_to_nir.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgallium_nir_la_CFLAGS) $(CFLAGS) -c -o nir/libgallium_nir_la-tgsi_to_nir.lo `test -f 'nir/tgsi_to_nir.c' || echo '$(srcdir)/'`nir/tgsi_to_nir.c
+
 vl/libgalliumvl_la-vl_compositor.lo: vl/vl_compositor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgalliumvl_la_CFLAGS) $(CFLAGS) -MT vl/libgalliumvl_la-vl_compositor.lo -MD -MP -MF vl/$(DEPDIR)/libgalliumvl_la-vl_compositor.Tpo -c -o vl/libgalliumvl_la-vl_compositor.lo `test -f 'vl/vl_compositor.c' || echo '$(srcdir)/'`vl/vl_compositor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) vl/$(DEPDIR)/libgalliumvl_la-vl_compositor.Tpo vl/$(DEPDIR)/libgalliumvl_la-vl_compositor.Plo
@@ -2144,6 +2197,13 @@ vl/libgalliumvlwinsys_la-vl_winsys_dri.lo: vl/vl_winsys_dri.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgalliumvlwinsys_la_CFLAGS) $(CFLAGS) -c -o vl/libgalliumvlwinsys_la-vl_winsys_dri.lo `test -f 'vl/vl_winsys_dri.c' || echo '$(srcdir)/'`vl/vl_winsys_dri.c
 
+vl/libgalliumvlwinsys_la-vl_winsys_drm.lo: vl/vl_winsys_drm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgalliumvlwinsys_la_CFLAGS) $(CFLAGS) -MT vl/libgalliumvlwinsys_la-vl_winsys_drm.lo -MD -MP -MF vl/$(DEPDIR)/libgalliumvlwinsys_la-vl_winsys_drm.Tpo -c -o vl/libgalliumvlwinsys_la-vl_winsys_drm.lo `test -f 'vl/vl_winsys_drm.c' || echo '$(srcdir)/'`vl/vl_winsys_drm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) vl/$(DEPDIR)/libgalliumvlwinsys_la-vl_winsys_drm.Tpo vl/$(DEPDIR)/libgalliumvlwinsys_la-vl_winsys_drm.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='vl/vl_winsys_drm.c' object='vl/libgalliumvlwinsys_la-vl_winsys_drm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgalliumvlwinsys_la_CFLAGS) $(CFLAGS) -c -o vl/libgalliumvlwinsys_la-vl_winsys_drm.lo `test -f 'vl/vl_winsys_drm.c' || echo '$(srcdir)/'`vl/vl_winsys_drm.c
+
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -2189,53 +2249,6 @@ clean-libtool:
 	-rm -rf util/.libs util/_libs
 	-rm -rf vl/.libs vl/_libs
 
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-cscopelist-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
-	done
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -2246,23 +2259,10 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	mkid -fID $$unique
 tags: TAGS
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -2281,7 +2281,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  fi; \
 	fi
 ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -2298,7 +2298,7 @@ GTAGS:
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
 	list='$(SOURCES) $(HEADERS) $(LISP)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
@@ -2345,45 +2345,19 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
 check-am: all-am
-check: check-recursive
+check: check-am
 all-am: Makefile $(LTLIBRARIES)
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-recursive
+installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
@@ -2435,95 +2409,92 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
 	mostlyclean-am
 
-distclean: distclean-recursive
+distclean: distclean-am
 	-rm -rf cso_cache/$(DEPDIR) draw/$(DEPDIR) gallivm/$(DEPDIR) hud/$(DEPDIR) indices/$(DEPDIR) nir/$(DEPDIR) os/$(DEPDIR) pipebuffer/$(DEPDIR) postprocess/$(DEPDIR) rbug/$(DEPDIR) rtasm/$(DEPDIR) tgsi/$(DEPDIR) translate/$(DEPDIR) util/$(DEPDIR) vl/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
-dvi: dvi-recursive
+dvi: dvi-am
 
 dvi-am:
 
-html: html-recursive
+html: html-am
 
 html-am:
 
-info: info-recursive
+info: info-am
 
 info-am:
 
 install-data-am:
 
-install-dvi: install-dvi-recursive
+install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am:
 
-install-html: install-html-recursive
+install-html: install-html-am
 
 install-html-am:
 
-install-info: install-info-recursive
+install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
-install-pdf: install-pdf-recursive
+install-pdf: install-pdf-am
 
 install-pdf-am:
 
-install-ps: install-ps-recursive
+install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-am
 	-rm -rf cso_cache/$(DEPDIR) draw/$(DEPDIR) gallivm/$(DEPDIR) hud/$(DEPDIR) indices/$(DEPDIR) nir/$(DEPDIR) os/$(DEPDIR) pipebuffer/$(DEPDIR) postprocess/$(DEPDIR) rbug/$(DEPDIR) rtasm/$(DEPDIR) tgsi/$(DEPDIR) translate/$(DEPDIR) util/$(DEPDIR) vl/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
-pdf: pdf-recursive
+pdf: pdf-am
 
 pdf-am:
 
-ps: ps-recursive
+ps: ps-am
 
 ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
-	cscopelist-recursive ctags-recursive install-am install-strip \
-	tags-recursive
+.MAKE: install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	clean-noinstLTLIBRARIES cscopelist cscopelist-recursive ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
+	tags uninstall uninstall-am
 
 
 @REGEN_SOURCES_TRUE@indices/u_indices_gen.c: indices/u_indices_gen.py