import Mesa 11.0.6

3 files changed, 4 insertions, 53 deletions

diff --git a/lib/mesa/src/gallium/drivers/llvmpipe/Makefile.sources b/lib/mesa/src/gallium/drivers/llvmpipe/Makefile.sources
index 71579cd02..d928ccba4 100644
--- a/lib/mesa/src/gallium/drivers/llvmpipe/Makefile.sources
+++ b/lib/mesa/src/gallium/drivers/llvmpipe/Makefile.sources
@@ -13,8 +13,6 @@ C_SOURCES := \
 	lp_clear.h \
 	lp_context.c \
 	lp_context.h \
-	lp_cs_tpool.c \
-	lp_cs_tpool.h \
 	lp_debug.h \
 	lp_draw_arrays.c \
 	lp_fence.c \
@@ -53,8 +51,6 @@ C_SOURCES := \
 	lp_state_blend.c \
 	lp_state_clip.c \
 	lp_state_derived.c \
-	lp_state_cs.c \
-	lp_state_cs.h \
 	lp_state_fs.c \
 	lp_state_fs.h \
 	lp_state_gs.c \
@@ -65,7 +61,6 @@ C_SOURCES := \
 	lp_state_setup.h \
 	lp_state_so.c \
 	lp_state_surface.c \
-	lp_state_tess.c \
 	lp_state_vertex.c \
 	lp_state_vs.c \
 	lp_surface.c \
diff --git a/lib/mesa/src/gallium/drivers/nouveau/Makefile.sources b/lib/mesa/src/gallium/drivers/nouveau/Makefile.sources
index 8b2ab3806..9346ea320 100644
--- a/lib/mesa/src/gallium/drivers/nouveau/Makefile.sources
+++ b/lib/mesa/src/gallium/drivers/nouveau/Makefile.sources
@@ -12,6 +12,7 @@ C_SOURCES := \
 	nouveau_mm.h \
 	nouveau_screen.c \
 	nouveau_screen.h \
+	nouveau_statebuf.h \
 	nouveau_video.c \
 	nouveau_video.h \
 	nouveau_vp3_video_bsp.c \
@@ -59,29 +60,19 @@ NV30_C_SOURCES := \
 	nv30/nvfx_vertprog.c
 
 NV50_C_SOURCES := \
-	nv50/g80_defs.xml.h \
-	nv50/g80_texture.xml.h \
 	nv50/nv50_2d.xml.h \
 	nv50/nv50_3ddefs.xml.h \
 	nv50/nv50_3d.xml.h \
 	nv50/nv50_blit.h \
-	nv50/nv50_compute.c \
-	nv50/nv50_compute.xml.h \
 	nv50/nv50_context.c \
 	nv50/nv50_context.h \
+	nv50/nv50_defs.xml.h \
 	nv50/nv50_formats.c \
 	nv50/nv50_miptree.c \
 	nv50/nv50_program.c \
 	nv50/nv50_program.h \
 	nv50/nv50_push.c \
 	nv50/nv50_query.c \
-	nv50/nv50_query.h \
-	nv50/nv50_query_hw.c \
-	nv50/nv50_query_hw.h \
-	nv50/nv50_query_hw_metric.c \
-	nv50/nv50_query_hw_metric.h \
-	nv50/nv50_query_hw_sm.c \
-	nv50/nv50_query_hw_sm.h \
 	nv50/nv50_resource.c \
 	nv50/nv50_resource.h \
 	nv50/nv50_screen.c \
@@ -93,6 +84,7 @@ NV50_C_SOURCES := \
 	nv50/nv50_state_validate.c \
 	nv50/nv50_surface.c \
 	nv50/nv50_tex.c \
+	nv50/nv50_texture.xml.h \
 	nv50/nv50_transfer.c \
 	nv50/nv50_transfer.h \
 	nv50/nv50_vbo.c \
@@ -114,21 +106,15 @@ NV50_CODEGEN_SOURCES := \
 	codegen/nv50_ir_build_util.h \
 	codegen/nv50_ir_driver.h \
 	codegen/nv50_ir_emit_nv50.cpp \
-	codegen/nv50_ir_from_common.cpp \
-	codegen/nv50_ir_from_common.h \
-	codegen/nv50_ir_from_nir.cpp \
 	codegen/nv50_ir_from_tgsi.cpp \
 	codegen/nv50_ir_graph.cpp \
 	codegen/nv50_ir_graph.h \
 	codegen/nv50_ir.h \
 	codegen/nv50_ir_inlines.h \
-	codegen/nv50_ir_lowering_helper.cpp \
-	codegen/nv50_ir_lowering_helper.h \
 	codegen/nv50_ir_lowering_nv50.cpp \
 	codegen/nv50_ir_peephole.cpp \
 	codegen/nv50_ir_print.cpp \
 	codegen/nv50_ir_ra.cpp \
-	codegen/nv50_ir_serialize.cpp \
 	codegen/nv50_ir_ssa.cpp \
 	codegen/nv50_ir_target.cpp \
 	codegen/nv50_ir_target.h \
@@ -141,34 +127,20 @@ NV50_CODEGEN_SOURCES := \
 NVC0_CODEGEN_SOURCES := \
 	codegen/nv50_ir_emit_gk110.cpp \
 	codegen/nv50_ir_emit_gm107.cpp \
-	codegen/nv50_ir_emit_gv100.cpp \
-	codegen/nv50_ir_emit_gv100.h \
 	codegen/nv50_ir_emit_nvc0.cpp \
 	codegen/nv50_ir_lowering_gm107.cpp \
 	codegen/nv50_ir_lowering_gm107.h \
-	codegen/nv50_ir_lowering_gv100.cpp \
-	codegen/nv50_ir_lowering_gv100.h \
 	codegen/nv50_ir_lowering_nvc0.cpp \
 	codegen/nv50_ir_lowering_nvc0.h \
 	codegen/nv50_ir_target_gm107.cpp \
 	codegen/nv50_ir_target_gm107.h \
-	codegen/nv50_ir_target_gv100.cpp \
-	codegen/nv50_ir_target_gv100.h \
 	codegen/nv50_ir_target_nvc0.cpp \
 	codegen/nv50_ir_target_nvc0.h
 
 NVC0_C_SOURCES := \
-	nvc0/cla0c0qmd.h \
-	nvc0/clc0c0qmd.h \
-	nvc0/clc3c0qmd.h \
-	nvc0/drf.h \
-	nvc0/qmd.h \
-	nvc0/qmda0c0.c \
-	nvc0/qmdc0c0.c \
-	nvc0/qmdc3c0.c \
-	nvc0/gm107_texture.xml.h \
 	nvc0/nvc0_3d.xml.h \
 	nvc0/nvc0_compute.c \
+	nvc0/nvc0_compute.h \
 	nvc0/nvc0_compute.xml.h \
 	nvc0/nvc0_context.c \
 	nvc0/nvc0_context.h \
@@ -179,15 +151,6 @@ NVC0_C_SOURCES := \
 	nvc0/nvc0_program.c \
 	nvc0/nvc0_program.h \
 	nvc0/nvc0_query.c \
-	nvc0/nvc0_query.h \
-	nvc0/nvc0_query_hw.c \
-	nvc0/nvc0_query_hw.h \
-	nvc0/nvc0_query_hw_metric.c \
-	nvc0/nvc0_query_hw_metric.h \
-	nvc0/nvc0_query_hw_sm.c \
-	nvc0/nvc0_query_hw_sm.h \
-	nvc0/nvc0_query_sw.c \
-	nvc0/nvc0_query_sw.h \
 	nvc0/nvc0_resource.c \
 	nvc0/nvc0_resource.h \
 	nvc0/nvc0_screen.c \
@@ -210,5 +173,4 @@ NVC0_C_SOURCES := \
 	nvc0/nve4_compute.c \
 	nvc0/nve4_compute.h \
 	nvc0/nve4_compute.xml.h \
-	nvc0/nve4_copy.xml.h \
 	nvc0/nve4_p2mf.xml.h
diff --git a/lib/mesa/src/gallium/drivers/softpipe/Makefile.sources b/lib/mesa/src/gallium/drivers/softpipe/Makefile.sources
index e405ef27f..2af3d6af2 100644
--- a/lib/mesa/src/gallium/drivers/softpipe/Makefile.sources
+++ b/lib/mesa/src/gallium/drivers/softpipe/Makefile.sources
@@ -1,11 +1,8 @@
 C_SOURCES := \
-	sp_buffer.c \
-	sp_buffer.h \
 	sp_clear.c \
 	sp_clear.h \
 	sp_context.c \
 	sp_context.h \
-	sp_compute.c \
 	sp_draw_arrays.c \
 	sp_fence.c \
 	sp_fence.h \
@@ -13,8 +10,6 @@ C_SOURCES := \
 	sp_flush.h \
 	sp_fs_exec.c \
 	sp_fs.h \
-	sp_image.c \
-	sp_image.h \
 	sp_limits.h \
 	sp_prim_vbuf.c \
 	sp_prim_vbuf.h \
@@ -36,7 +31,6 @@ C_SOURCES := \
 	sp_state_blend.c \
 	sp_state_clip.c \
 	sp_state_derived.c \
-	sp_state_image.c \
 	sp_state.h \
 	sp_state_rasterizer.c \
 	sp_state_sampler.c \