342 files changed, 0 insertions, 0 deletions

diff --git a/src/mesa/pipe/Makefile b/src/gallium/Makefile
index d880d090c15..d880d090c15 100644
--- a/src/mesa/pipe/Makefile
+++ b/src/gallium/Makefile
diff --git a/src/mesa/pipe/Makefile.template b/src/gallium/Makefile.template
index 8e84f8eb2d7..8e84f8eb2d7 100644
--- a/src/mesa/pipe/Makefile.template
+++ b/src/gallium/Makefile.template
diff --git a/src/mesa/pipe/README.portability b/src/gallium/README.portability
index c70ca774da0..c70ca774da0 100644
--- a/src/mesa/pipe/README.portability
+++ b/src/gallium/README.portability
diff --git a/src/mesa/pipe/SConscript b/src/gallium/SConscript
index d9c20e01007..d9c20e01007 100644
--- a/src/mesa/pipe/SConscript
+++ b/src/gallium/SConscript
diff --git a/src/mesa/pipe/cso_cache/cso_cache.c b/src/gallium/aux/cso_cache/cso_cache.c
index 9e77e0774dd..9e77e0774dd 100644
--- a/src/mesa/pipe/cso_cache/cso_cache.c
+++ b/src/gallium/aux/cso_cache/cso_cache.c
diff --git a/src/mesa/pipe/cso_cache/cso_cache.h b/src/gallium/aux/cso_cache/cso_cache.h
index 116e2eaa2c8..116e2eaa2c8 100644
--- a/src/mesa/pipe/cso_cache/cso_cache.h
+++ b/src/gallium/aux/cso_cache/cso_cache.h
diff --git a/src/mesa/pipe/cso_cache/cso_hash.c b/src/gallium/aux/cso_cache/cso_hash.c
index 0338cb3b474..0338cb3b474 100644
--- a/src/mesa/pipe/cso_cache/cso_hash.c
+++ b/src/gallium/aux/cso_cache/cso_hash.c
diff --git a/src/mesa/pipe/cso_cache/cso_hash.h b/src/gallium/aux/cso_cache/cso_hash.h
index b4aa111860f..b4aa111860f 100644
--- a/src/mesa/pipe/cso_cache/cso_hash.h
+++ b/src/gallium/aux/cso_cache/cso_hash.h
diff --git a/src/mesa/pipe/draw/Makefile b/src/gallium/aux/draw/Makefile
index 451911a3545..451911a3545 100644
--- a/src/mesa/pipe/draw/Makefile
+++ b/src/gallium/aux/draw/Makefile
diff --git a/src/mesa/pipe/draw/draw_clip.c b/src/gallium/aux/draw/draw_clip.c
index e3051507eaf..e3051507eaf 100644
--- a/src/mesa/pipe/draw/draw_clip.c
+++ b/src/gallium/aux/draw/draw_clip.c
diff --git a/src/mesa/pipe/draw/draw_context.c b/src/gallium/aux/draw/draw_context.c
index 4be38303169..4be38303169 100644
--- a/src/mesa/pipe/draw/draw_context.c
+++ b/src/gallium/aux/draw/draw_context.c
diff --git a/src/mesa/pipe/draw/draw_context.h b/src/gallium/aux/draw/draw_context.h
index ddeb184497a..ddeb184497a 100644
--- a/src/mesa/pipe/draw/draw_context.h
+++ b/src/gallium/aux/draw/draw_context.h
diff --git a/src/mesa/pipe/draw/draw_cull.c b/src/gallium/aux/draw/draw_cull.c
index 8177b0ac86e..8177b0ac86e 100644
--- a/src/mesa/pipe/draw/draw_cull.c
+++ b/src/gallium/aux/draw/draw_cull.c
diff --git a/src/mesa/pipe/draw/draw_debug.c b/src/gallium/aux/draw/draw_debug.c
index d6220b5f62c..d6220b5f62c 100644
--- a/src/mesa/pipe/draw/draw_debug.c
+++ b/src/gallium/aux/draw/draw_debug.c
diff --git a/src/mesa/pipe/draw/draw_flatshade.c b/src/gallium/aux/draw/draw_flatshade.c
index 4398abbc60c..4398abbc60c 100644
--- a/src/mesa/pipe/draw/draw_flatshade.c
+++ b/src/gallium/aux/draw/draw_flatshade.c
diff --git a/src/mesa/pipe/draw/draw_offset.c b/src/gallium/aux/draw/draw_offset.c
index dbc676deae4..dbc676deae4 100644
--- a/src/mesa/pipe/draw/draw_offset.c
+++ b/src/gallium/aux/draw/draw_offset.c
diff --git a/src/mesa/pipe/draw/draw_prim.c b/src/gallium/aux/draw/draw_prim.c
index 51e2242719a..51e2242719a 100644
--- a/src/mesa/pipe/draw/draw_prim.c
+++ b/src/gallium/aux/draw/draw_prim.c
diff --git a/src/mesa/pipe/draw/draw_private.h b/src/gallium/aux/draw/draw_private.h
index b17eaaed65e..b17eaaed65e 100644
--- a/src/mesa/pipe/draw/draw_private.h
+++ b/src/gallium/aux/draw/draw_private.h
diff --git a/src/mesa/pipe/draw/draw_stipple.c b/src/gallium/aux/draw/draw_stipple.c
index 506f33512c8..506f33512c8 100644
--- a/src/mesa/pipe/draw/draw_stipple.c
+++ b/src/gallium/aux/draw/draw_stipple.c
diff --git a/src/mesa/pipe/draw/draw_twoside.c b/src/gallium/aux/draw/draw_twoside.c
index 1c389579871..1c389579871 100644
--- a/src/mesa/pipe/draw/draw_twoside.c
+++ b/src/gallium/aux/draw/draw_twoside.c
diff --git a/src/mesa/pipe/draw/draw_unfilled.c b/src/gallium/aux/draw/draw_unfilled.c
index 8777cfdfc86..8777cfdfc86 100644
--- a/src/mesa/pipe/draw/draw_unfilled.c
+++ b/src/gallium/aux/draw/draw_unfilled.c
diff --git a/src/mesa/pipe/draw/draw_validate.c b/src/gallium/aux/draw/draw_validate.c
index 4375ebabbc4..4375ebabbc4 100644
--- a/src/mesa/pipe/draw/draw_validate.c
+++ b/src/gallium/aux/draw/draw_validate.c
diff --git a/src/mesa/pipe/draw/draw_vbuf.c b/src/gallium/aux/draw/draw_vbuf.c
index 71ac73912b8..71ac73912b8 100644
--- a/src/mesa/pipe/draw/draw_vbuf.c
+++ b/src/gallium/aux/draw/draw_vbuf.c
diff --git a/src/mesa/pipe/draw/draw_vbuf.h b/src/gallium/aux/draw/draw_vbuf.h
index cfd2b9820c1..cfd2b9820c1 100644
--- a/src/mesa/pipe/draw/draw_vbuf.h
+++ b/src/gallium/aux/draw/draw_vbuf.h
diff --git a/src/mesa/pipe/draw/draw_vertex.c b/src/gallium/aux/draw/draw_vertex.c
index 2d6592150fc..2d6592150fc 100644
--- a/src/mesa/pipe/draw/draw_vertex.c
+++ b/src/gallium/aux/draw/draw_vertex.c
diff --git a/src/mesa/pipe/draw/draw_vertex.h b/src/gallium/aux/draw/draw_vertex.h
index 267c74203bd..267c74203bd 100644
--- a/src/mesa/pipe/draw/draw_vertex.h
+++ b/src/gallium/aux/draw/draw_vertex.h
diff --git a/src/mesa/pipe/draw/draw_vertex_cache.c b/src/gallium/aux/draw/draw_vertex_cache.c
index 44427999ccf..44427999ccf 100644
--- a/src/mesa/pipe/draw/draw_vertex_cache.c
+++ b/src/gallium/aux/draw/draw_vertex_cache.c
diff --git a/src/mesa/pipe/draw/draw_vertex_fetch.c b/src/gallium/aux/draw/draw_vertex_fetch.c
index e13df04605c..e13df04605c 100644
--- a/src/mesa/pipe/draw/draw_vertex_fetch.c
+++ b/src/gallium/aux/draw/draw_vertex_fetch.c
diff --git a/src/mesa/pipe/draw/draw_vertex_shader.c b/src/gallium/aux/draw/draw_vertex_shader.c
index c824c1407e9..c824c1407e9 100644
--- a/src/mesa/pipe/draw/draw_vertex_shader.c
+++ b/src/gallium/aux/draw/draw_vertex_shader.c
diff --git a/src/mesa/pipe/draw/draw_vf.c b/src/gallium/aux/draw/draw_vf.c
index dc3a5ecd219..dc3a5ecd219 100644
--- a/src/mesa/pipe/draw/draw_vf.c
+++ b/src/gallium/aux/draw/draw_vf.c
diff --git a/src/mesa/pipe/draw/draw_vf.h b/src/gallium/aux/draw/draw_vf.h
index 011c8f0ff1c..011c8f0ff1c 100644
--- a/src/mesa/pipe/draw/draw_vf.h
+++ b/src/gallium/aux/draw/draw_vf.h
diff --git a/src/mesa/pipe/draw/draw_vf_generic.c b/src/gallium/aux/draw/draw_vf_generic.c
index 7a60a9db9c3..7a60a9db9c3 100644
--- a/src/mesa/pipe/draw/draw_vf_generic.c
+++ b/src/gallium/aux/draw/draw_vf_generic.c
diff --git a/src/mesa/pipe/draw/draw_vf_sse.c b/src/gallium/aux/draw/draw_vf_sse.c
index 1ad2ae756dd..1ad2ae756dd 100644
--- a/src/mesa/pipe/draw/draw_vf_sse.c
+++ b/src/gallium/aux/draw/draw_vf_sse.c
diff --git a/src/mesa/pipe/draw/draw_wide_prims.c b/src/gallium/aux/draw/draw_wide_prims.c
index 655774b155f..655774b155f 100644
--- a/src/mesa/pipe/draw/draw_wide_prims.c
+++ b/src/gallium/aux/draw/draw_wide_prims.c
diff --git a/src/mesa/pipe/llvm/Makefile b/src/gallium/aux/llvm/Makefile
index 9c6e16d86b7..9c6e16d86b7 100644
--- a/src/mesa/pipe/llvm/Makefile
+++ b/src/gallium/aux/llvm/Makefile
diff --git a/src/mesa/pipe/llvm/gallivm.cpp b/src/gallium/aux/llvm/gallivm.cpp
index da0105c2c98..da0105c2c98 100644
--- a/src/mesa/pipe/llvm/gallivm.cpp
+++ b/src/gallium/aux/llvm/gallivm.cpp
diff --git a/src/mesa/pipe/llvm/gallivm.h b/src/gallium/aux/llvm/gallivm.h
index 92da4bca7f4..92da4bca7f4 100644
--- a/src/mesa/pipe/llvm/gallivm.h
+++ b/src/gallium/aux/llvm/gallivm.h
diff --git a/src/mesa/pipe/llvm/gallivm_builtins.cpp b/src/gallium/aux/llvm/gallivm_builtins.cpp
index 1796f0a1772..1796f0a1772 100644
--- a/src/mesa/pipe/llvm/gallivm_builtins.cpp
+++ b/src/gallium/aux/llvm/gallivm_builtins.cpp
diff --git a/src/mesa/pipe/llvm/gallivm_cpu.cpp b/src/gallium/aux/llvm/gallivm_cpu.cpp
index dc4d92a72a6..dc4d92a72a6 100644
--- a/src/mesa/pipe/llvm/gallivm_cpu.cpp
+++ b/src/gallium/aux/llvm/gallivm_cpu.cpp
diff --git a/src/mesa/pipe/llvm/gallivm_p.h b/src/gallium/aux/llvm/gallivm_p.h
index cfe7b1901b3..cfe7b1901b3 100644
--- a/src/mesa/pipe/llvm/gallivm_p.h
+++ b/src/gallium/aux/llvm/gallivm_p.h
diff --git a/src/mesa/pipe/llvm/instructions.cpp b/src/gallium/aux/llvm/instructions.cpp
index 55d39fa5f12..55d39fa5f12 100644
--- a/src/mesa/pipe/llvm/instructions.cpp
+++ b/src/gallium/aux/llvm/instructions.cpp
diff --git a/src/mesa/pipe/llvm/instructions.h b/src/gallium/aux/llvm/instructions.h
index 9ebc17dd8ec..9ebc17dd8ec 100644
--- a/src/mesa/pipe/llvm/instructions.h
+++ b/src/gallium/aux/llvm/instructions.h
diff --git a/src/mesa/pipe/llvm/instructionssoa.cpp b/src/gallium/aux/llvm/instructionssoa.cpp
index a4d50466373..a4d50466373 100644
--- a/src/mesa/pipe/llvm/instructionssoa.cpp
+++ b/src/gallium/aux/llvm/instructionssoa.cpp
diff --git a/src/mesa/pipe/llvm/instructionssoa.h b/src/gallium/aux/llvm/instructionssoa.h
index 4169dcbb2eb..4169dcbb2eb 100644
--- a/src/mesa/pipe/llvm/instructionssoa.h
+++ b/src/gallium/aux/llvm/instructionssoa.h
diff --git a/src/mesa/pipe/llvm/llvm_builtins.c b/src/gallium/aux/llvm/llvm_builtins.c
index 4f98d754baa..4f98d754baa 100644
--- a/src/mesa/pipe/llvm/llvm_builtins.c
+++ b/src/gallium/aux/llvm/llvm_builtins.c
diff --git a/src/mesa/pipe/llvm/loweringpass.cpp b/src/gallium/aux/llvm/loweringpass.cpp
index 556dbec3661..556dbec3661 100644
--- a/src/mesa/pipe/llvm/loweringpass.cpp
+++ b/src/gallium/aux/llvm/loweringpass.cpp
diff --git a/src/mesa/pipe/llvm/loweringpass.h b/src/gallium/aux/llvm/loweringpass.h
index f62dcf6ba73..f62dcf6ba73 100644
--- a/src/mesa/pipe/llvm/loweringpass.h
+++ b/src/gallium/aux/llvm/loweringpass.h
diff --git a/src/mesa/pipe/llvm/storage.cpp b/src/gallium/aux/llvm/storage.cpp
index c4326de8c53..c4326de8c53 100644
--- a/src/mesa/pipe/llvm/storage.cpp
+++ b/src/gallium/aux/llvm/storage.cpp
diff --git a/src/mesa/pipe/llvm/storage.h b/src/gallium/aux/llvm/storage.h
index 8574f7554e3..8574f7554e3 100644
--- a/src/mesa/pipe/llvm/storage.h
+++ b/src/gallium/aux/llvm/storage.h
diff --git a/src/mesa/pipe/llvm/storagesoa.cpp b/src/gallium/aux/llvm/storagesoa.cpp
index ed0674a96f0..ed0674a96f0 100644
--- a/src/mesa/pipe/llvm/storagesoa.cpp
+++ b/src/gallium/aux/llvm/storagesoa.cpp
diff --git a/src/mesa/pipe/llvm/storagesoa.h b/src/gallium/aux/llvm/storagesoa.h
index 6443351f270..6443351f270 100644
--- a/src/mesa/pipe/llvm/storagesoa.h
+++ b/src/gallium/aux/llvm/storagesoa.h
diff --git a/src/mesa/pipe/llvm/tgsitollvm.cpp b/src/gallium/aux/llvm/tgsitollvm.cpp
index 0de595e6789..0de595e6789 100644
--- a/src/mesa/pipe/llvm/tgsitollvm.cpp
+++ b/src/gallium/aux/llvm/tgsitollvm.cpp
diff --git a/src/mesa/pipe/llvm/tgsitollvm.h b/src/gallium/aux/llvm/tgsitollvm.h
index 7ada04d6299..7ada04d6299 100644
--- a/src/mesa/pipe/llvm/tgsitollvm.h
+++ b/src/gallium/aux/llvm/tgsitollvm.h
diff --git a/src/mesa/pipe/pipebuffer/Makefile b/src/gallium/aux/pipebuffer/Makefile
index 75764a9a188..75764a9a188 100644
--- a/src/mesa/pipe/pipebuffer/Makefile
+++ b/src/gallium/aux/pipebuffer/Makefile
diff --git a/src/mesa/pipe/pipebuffer/linked_list.h b/src/gallium/aux/pipebuffer/linked_list.h
index e99817fb130..e99817fb130 100644
--- a/src/mesa/pipe/pipebuffer/linked_list.h
+++ b/src/gallium/aux/pipebuffer/linked_list.h
diff --git a/src/mesa/pipe/pipebuffer/pb_buffer.h b/src/gallium/aux/pipebuffer/pb_buffer.h
index 97beb5f72a9..97beb5f72a9 100644
--- a/src/mesa/pipe/pipebuffer/pb_buffer.h
+++ b/src/gallium/aux/pipebuffer/pb_buffer.h
diff --git a/src/mesa/pipe/pipebuffer/pb_buffer_fenced.c b/src/gallium/aux/pipebuffer/pb_buffer_fenced.c
index f4fc3f6d714..f4fc3f6d714 100644
--- a/src/mesa/pipe/pipebuffer/pb_buffer_fenced.c
+++ b/src/gallium/aux/pipebuffer/pb_buffer_fenced.c
diff --git a/src/mesa/pipe/pipebuffer/pb_buffer_fenced.h b/src/gallium/aux/pipebuffer/pb_buffer_fenced.h
index c40b9c75e18..c40b9c75e18 100644
--- a/src/mesa/pipe/pipebuffer/pb_buffer_fenced.h
+++ b/src/gallium/aux/pipebuffer/pb_buffer_fenced.h
diff --git a/src/mesa/pipe/pipebuffer/pb_buffer_malloc.c b/src/gallium/aux/pipebuffer/pb_buffer_malloc.c
index 9e8244f909b..9e8244f909b 100644
--- a/src/mesa/pipe/pipebuffer/pb_buffer_malloc.c
+++ b/src/gallium/aux/pipebuffer/pb_buffer_malloc.c
diff --git a/src/mesa/pipe/pipebuffer/pb_bufmgr.h b/src/gallium/aux/pipebuffer/pb_bufmgr.h
index 1ddf784c978..1ddf784c978 100644
--- a/src/mesa/pipe/pipebuffer/pb_bufmgr.h
+++ b/src/gallium/aux/pipebuffer/pb_bufmgr.h
diff --git a/src/mesa/pipe/pipebuffer/pb_bufmgr_fenced.c b/src/gallium/aux/pipebuffer/pb_bufmgr_fenced.c
index c535d3276c9..c535d3276c9 100644
--- a/src/mesa/pipe/pipebuffer/pb_bufmgr_fenced.c
+++ b/src/gallium/aux/pipebuffer/pb_bufmgr_fenced.c
diff --git a/src/mesa/pipe/pipebuffer/pb_bufmgr_mm.c b/src/gallium/aux/pipebuffer/pb_bufmgr_mm.c
index 8b1b51c0e28..8b1b51c0e28 100644
--- a/src/mesa/pipe/pipebuffer/pb_bufmgr_mm.c
+++ b/src/gallium/aux/pipebuffer/pb_bufmgr_mm.c
diff --git a/src/mesa/pipe/pipebuffer/pb_bufmgr_pool.c b/src/gallium/aux/pipebuffer/pb_bufmgr_pool.c
index 04477a865a5..04477a865a5 100644
--- a/src/mesa/pipe/pipebuffer/pb_bufmgr_pool.c
+++ b/src/gallium/aux/pipebuffer/pb_bufmgr_pool.c
diff --git a/src/mesa/pipe/pipebuffer/pb_winsys.c b/src/gallium/aux/pipebuffer/pb_winsys.c
index 978944091fd..978944091fd 100644
--- a/src/mesa/pipe/pipebuffer/pb_winsys.c
+++ b/src/gallium/aux/pipebuffer/pb_winsys.c
diff --git a/src/mesa/pipe/tgsi/Makefile b/src/gallium/aux/tgsi/Makefile
index 12a8bd0409e..12a8bd0409e 100644
--- a/src/mesa/pipe/tgsi/Makefile
+++ b/src/gallium/aux/tgsi/Makefile
diff --git a/src/mesa/pipe/tgsi/exec/Makefile b/src/gallium/aux/tgsi/exec/Makefile
index eb8b14e0e89..eb8b14e0e89 100644
--- a/src/mesa/pipe/tgsi/exec/Makefile
+++ b/src/gallium/aux/tgsi/exec/Makefile
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.c b/src/gallium/aux/tgsi/exec/tgsi_exec.c
index 37e60070686..37e60070686 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_exec.c
+++ b/src/gallium/aux/tgsi/exec/tgsi_exec.c
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.h b/src/gallium/aux/tgsi/exec/tgsi_exec.h
index 1fb66ee960f..1fb66ee960f 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_exec.h
+++ b/src/gallium/aux/tgsi/exec/tgsi_exec.h
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_sse2.c b/src/gallium/aux/tgsi/exec/tgsi_sse2.c
index 1e56e4afb69..1e56e4afb69 100755
--- a/src/mesa/pipe/tgsi/exec/tgsi_sse2.c
+++ b/src/gallium/aux/tgsi/exec/tgsi_sse2.c
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_sse2.h b/src/gallium/aux/tgsi/exec/tgsi_sse2.h
index 9bee3717665..9bee3717665 100755
--- a/src/mesa/pipe/tgsi/exec/tgsi_sse2.h
+++ b/src/gallium/aux/tgsi/exec/tgsi_sse2.h
diff --git a/src/mesa/pipe/tgsi/util/tgsi_build.c b/src/gallium/aux/tgsi/util/tgsi_build.c
index a00ff1c2a5f..a00ff1c2a5f 100644
--- a/src/mesa/pipe/tgsi/util/tgsi_build.c
+++ b/src/gallium/aux/tgsi/util/tgsi_build.c
diff --git a/src/mesa/pipe/tgsi/util/tgsi_build.h b/src/gallium/aux/tgsi/util/tgsi_build.h
index 116c78abf34..116c78abf34 100644
--- a/src/mesa/pipe/tgsi/util/tgsi_build.h
+++ b/src/gallium/aux/tgsi/util/tgsi_build.h
diff --git a/src/mesa/pipe/tgsi/util/tgsi_dump.c b/src/gallium/aux/tgsi/util/tgsi_dump.c
index b5c54847e0b..b5c54847e0b 100644
--- a/src/mesa/pipe/tgsi/util/tgsi_dump.c
+++ b/src/gallium/aux/tgsi/util/tgsi_dump.c
diff --git a/src/mesa/pipe/tgsi/util/tgsi_dump.h b/src/gallium/aux/tgsi/util/tgsi_dump.h
index 1adc9db2519..1adc9db2519 100644
--- a/src/mesa/pipe/tgsi/util/tgsi_dump.h
+++ b/src/gallium/aux/tgsi/util/tgsi_dump.h
diff --git a/src/mesa/pipe/tgsi/util/tgsi_parse.c b/src/gallium/aux/tgsi/util/tgsi_parse.c
index bf6b89ce564..bf6b89ce564 100644
--- a/src/mesa/pipe/tgsi/util/tgsi_parse.c
+++ b/src/gallium/aux/tgsi/util/tgsi_parse.c
diff --git a/src/mesa/pipe/tgsi/util/tgsi_parse.h b/src/gallium/aux/tgsi/util/tgsi_parse.h
index 9372da8d5d1..9372da8d5d1 100644
--- a/src/mesa/pipe/tgsi/util/tgsi_parse.h
+++ b/src/gallium/aux/tgsi/util/tgsi_parse.h
diff --git a/src/mesa/pipe/tgsi/util/tgsi_transform.c b/src/gallium/aux/tgsi/util/tgsi_transform.c
index 357f77b05a6..357f77b05a6 100644
--- a/src/mesa/pipe/tgsi/util/tgsi_transform.c
+++ b/src/gallium/aux/tgsi/util/tgsi_transform.c
diff --git a/src/mesa/pipe/tgsi/util/tgsi_transform.h b/src/gallium/aux/tgsi/util/tgsi_transform.h
index 365d8c298c7..365d8c298c7 100644
--- a/src/mesa/pipe/tgsi/util/tgsi_transform.h
+++ b/src/gallium/aux/tgsi/util/tgsi_transform.h
diff --git a/src/mesa/pipe/tgsi/util/tgsi_util.c b/src/gallium/aux/tgsi/util/tgsi_util.c
index 4cdd89182ad..4cdd89182ad 100644
--- a/src/mesa/pipe/tgsi/util/tgsi_util.c
+++ b/src/gallium/aux/tgsi/util/tgsi_util.c
diff --git a/src/mesa/pipe/tgsi/util/tgsi_util.h b/src/gallium/aux/tgsi/util/tgsi_util.h
index ef14446f0e4..ef14446f0e4 100644
--- a/src/mesa/pipe/tgsi/util/tgsi_util.h
+++ b/src/gallium/aux/tgsi/util/tgsi_util.h
diff --git a/src/mesa/pipe/util/p_debug.c b/src/gallium/aux/util/p_debug.c
index b9607a6ba7f..b9607a6ba7f 100644
--- a/src/mesa/pipe/util/p_debug.c
+++ b/src/gallium/aux/util/p_debug.c
diff --git a/src/mesa/pipe/util/p_tile.c b/src/gallium/aux/util/p_tile.c
index 3f795a38989..3f795a38989 100644
--- a/src/mesa/pipe/util/p_tile.c
+++ b/src/gallium/aux/util/p_tile.c
diff --git a/src/mesa/pipe/util/p_tile.h b/src/gallium/aux/util/p_tile.h
index cd8124bf11f..cd8124bf11f 100644
--- a/src/mesa/pipe/util/p_tile.h
+++ b/src/gallium/aux/util/p_tile.h
diff --git a/src/mesa/pipe/util/p_util.c b/src/gallium/aux/util/p_util.c
index 2a92f8e408b..2a92f8e408b 100644
--- a/src/mesa/pipe/util/p_util.c
+++ b/src/gallium/aux/util/p_util.c
diff --git a/src/mesa/pipe/cell/Makefile b/src/gallium/drivers/cell/Makefile
index 47aef7b05f6..47aef7b05f6 100644
--- a/src/mesa/pipe/cell/Makefile
+++ b/src/gallium/drivers/cell/Makefile
diff --git a/src/mesa/pipe/cell/common.h b/src/gallium/drivers/cell/common.h
index 4de514c3586..4de514c3586 100644
--- a/src/mesa/pipe/cell/common.h
+++ b/src/gallium/drivers/cell/common.h
diff --git a/src/mesa/pipe/cell/ppu/Makefile b/src/gallium/drivers/cell/ppu/Makefile
index 50060f5cd30..50060f5cd30 100644
--- a/src/mesa/pipe/cell/ppu/Makefile
+++ b/src/gallium/drivers/cell/ppu/Makefile
diff --git a/src/mesa/pipe/cell/ppu/cell_batch.c b/src/gallium/drivers/cell/ppu/cell_batch.c
index f45e5f25b64..f45e5f25b64 100644
--- a/src/mesa/pipe/cell/ppu/cell_batch.c
+++ b/src/gallium/drivers/cell/ppu/cell_batch.c
diff --git a/src/mesa/pipe/cell/ppu/cell_batch.h b/src/gallium/drivers/cell/ppu/cell_batch.h
index a6eee0a8b18..a6eee0a8b18 100644
--- a/src/mesa/pipe/cell/ppu/cell_batch.h
+++ b/src/gallium/drivers/cell/ppu/cell_batch.h
diff --git a/src/mesa/pipe/cell/ppu/cell_clear.c b/src/gallium/drivers/cell/ppu/cell_clear.c
index 07b908eec59..07b908eec59 100644
--- a/src/mesa/pipe/cell/ppu/cell_clear.c
+++ b/src/gallium/drivers/cell/ppu/cell_clear.c
diff --git a/src/mesa/pipe/cell/ppu/cell_clear.h b/src/gallium/drivers/cell/ppu/cell_clear.h
index ff47d43f4cd..ff47d43f4cd 100644
--- a/src/mesa/pipe/cell/ppu/cell_clear.h
+++ b/src/gallium/drivers/cell/ppu/cell_clear.h
diff --git a/src/mesa/pipe/cell/ppu/cell_context.c b/src/gallium/drivers/cell/ppu/cell_context.c
index bbe1fd7a111..bbe1fd7a111 100644
--- a/src/mesa/pipe/cell/ppu/cell_context.c
+++ b/src/gallium/drivers/cell/ppu/cell_context.c
diff --git a/src/mesa/pipe/cell/ppu/cell_context.h b/src/gallium/drivers/cell/ppu/cell_context.h
index 3b63419b5eb..3b63419b5eb 100644
--- a/src/mesa/pipe/cell/ppu/cell_context.h
+++ b/src/gallium/drivers/cell/ppu/cell_context.h
diff --git a/src/mesa/pipe/cell/ppu/cell_draw_arrays.c b/src/gallium/drivers/cell/ppu/cell_draw_arrays.c
index 717cd8370f9..717cd8370f9 100644
--- a/src/mesa/pipe/cell/ppu/cell_draw_arrays.c
+++ b/src/gallium/drivers/cell/ppu/cell_draw_arrays.c
diff --git a/src/mesa/pipe/cell/ppu/cell_draw_arrays.h b/src/gallium/drivers/cell/ppu/cell_draw_arrays.h
index d5df4aa05f8..d5df4aa05f8 100644
--- a/src/mesa/pipe/cell/ppu/cell_draw_arrays.h
+++ b/src/gallium/drivers/cell/ppu/cell_draw_arrays.h
diff --git a/src/mesa/pipe/cell/ppu/cell_flush.c b/src/gallium/drivers/cell/ppu/cell_flush.c
index f62bc4650ce..f62bc4650ce 100644
--- a/src/mesa/pipe/cell/ppu/cell_flush.c
+++ b/src/gallium/drivers/cell/ppu/cell_flush.c
diff --git a/src/mesa/pipe/cell/ppu/cell_flush.h b/src/gallium/drivers/cell/ppu/cell_flush.h
index eda351b1cbc..eda351b1cbc 100644
--- a/src/mesa/pipe/cell/ppu/cell_flush.h
+++ b/src/gallium/drivers/cell/ppu/cell_flush.h
diff --git a/src/mesa/pipe/cell/ppu/cell_render.c b/src/gallium/drivers/cell/ppu/cell_render.c
index 4ab277a4b24..4ab277a4b24 100644
--- a/src/mesa/pipe/cell/ppu/cell_render.c
+++ b/src/gallium/drivers/cell/ppu/cell_render.c
diff --git a/src/mesa/pipe/cell/ppu/cell_render.h b/src/gallium/drivers/cell/ppu/cell_render.h
index 826dcbafeba..826dcbafeba 100644
--- a/src/mesa/pipe/cell/ppu/cell_render.h
+++ b/src/gallium/drivers/cell/ppu/cell_render.h
diff --git a/src/mesa/pipe/cell/ppu/cell_spu.c b/src/gallium/drivers/cell/ppu/cell_spu.c
index 7c83a47e574..7c83a47e574 100644
--- a/src/mesa/pipe/cell/ppu/cell_spu.c
+++ b/src/gallium/drivers/cell/ppu/cell_spu.c
diff --git a/src/mesa/pipe/cell/ppu/cell_spu.h b/src/gallium/drivers/cell/ppu/cell_spu.h
index 19eff94f967..19eff94f967 100644
--- a/src/mesa/pipe/cell/ppu/cell_spu.h
+++ b/src/gallium/drivers/cell/ppu/cell_spu.h
diff --git a/src/mesa/pipe/cell/ppu/cell_state.h b/src/gallium/drivers/cell/ppu/cell_state.h
index 3a71ba14fa8..3a71ba14fa8 100644
--- a/src/mesa/pipe/cell/ppu/cell_state.h
+++ b/src/gallium/drivers/cell/ppu/cell_state.h
diff --git a/src/mesa/pipe/cell/ppu/cell_state_blend.c b/src/gallium/drivers/cell/ppu/cell_state_blend.c
index 4fc60548c85..4fc60548c85 100644
--- a/src/mesa/pipe/cell/ppu/cell_state_blend.c
+++ b/src/gallium/drivers/cell/ppu/cell_state_blend.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_clip.c b/src/gallium/drivers/cell/ppu/cell_state_clip.c
index 4f43665941d..4f43665941d 100644
--- a/src/mesa/pipe/cell/ppu/cell_state_clip.c
+++ b/src/gallium/drivers/cell/ppu/cell_state_clip.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_derived.c b/src/gallium/drivers/cell/ppu/cell_state_derived.c
index 56daf5dfde0..56daf5dfde0 100644
--- a/src/mesa/pipe/cell/ppu/cell_state_derived.c
+++ b/src/gallium/drivers/cell/ppu/cell_state_derived.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_emit.c b/src/gallium/drivers/cell/ppu/cell_state_emit.c
index 5d2a7864493..5d2a7864493 100644
--- a/src/mesa/pipe/cell/ppu/cell_state_emit.c
+++ b/src/gallium/drivers/cell/ppu/cell_state_emit.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_emit.h b/src/gallium/drivers/cell/ppu/cell_state_emit.h
index 59f8affe8d3..59f8affe8d3 100644
--- a/src/mesa/pipe/cell/ppu/cell_state_emit.h
+++ b/src/gallium/drivers/cell/ppu/cell_state_emit.h
diff --git a/src/mesa/pipe/cell/ppu/cell_state_fs.c b/src/gallium/drivers/cell/ppu/cell_state_fs.c
index 3f46a87d189..3f46a87d189 100644
--- a/src/mesa/pipe/cell/ppu/cell_state_fs.c
+++ b/src/gallium/drivers/cell/ppu/cell_state_fs.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_rasterizer.c b/src/gallium/drivers/cell/ppu/cell_state_rasterizer.c
index d8128ece54d..d8128ece54d 100644
--- a/src/mesa/pipe/cell/ppu/cell_state_rasterizer.c
+++ b/src/gallium/drivers/cell/ppu/cell_state_rasterizer.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_sampler.c b/src/gallium/drivers/cell/ppu/cell_state_sampler.c
index ade6cc8338e..ade6cc8338e 100644
--- a/src/mesa/pipe/cell/ppu/cell_state_sampler.c
+++ b/src/gallium/drivers/cell/ppu/cell_state_sampler.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_surface.c b/src/gallium/drivers/cell/ppu/cell_state_surface.c
index 287610b76b9..287610b76b9 100644
--- a/src/mesa/pipe/cell/ppu/cell_state_surface.c
+++ b/src/gallium/drivers/cell/ppu/cell_state_surface.c
diff --git a/src/mesa/pipe/cell/ppu/cell_state_vertex.c b/src/gallium/drivers/cell/ppu/cell_state_vertex.c
index 0f01e920f95..0f01e920f95 100644
--- a/src/mesa/pipe/cell/ppu/cell_state_vertex.c
+++ b/src/gallium/drivers/cell/ppu/cell_state_vertex.c
diff --git a/src/mesa/pipe/cell/ppu/cell_surface.c b/src/gallium/drivers/cell/ppu/cell_surface.c
index fca93e47424..fca93e47424 100644
--- a/src/mesa/pipe/cell/ppu/cell_surface.c
+++ b/src/gallium/drivers/cell/ppu/cell_surface.c
diff --git a/src/mesa/pipe/cell/ppu/cell_surface.h b/src/gallium/drivers/cell/ppu/cell_surface.h
index 9e58f329443..9e58f329443 100644
--- a/src/mesa/pipe/cell/ppu/cell_surface.h
+++ b/src/gallium/drivers/cell/ppu/cell_surface.h
diff --git a/src/mesa/pipe/cell/ppu/cell_texture.c b/src/gallium/drivers/cell/ppu/cell_texture.c
index c8ef36002f7..c8ef36002f7 100644
--- a/src/mesa/pipe/cell/ppu/cell_texture.c
+++ b/src/gallium/drivers/cell/ppu/cell_texture.c
diff --git a/src/mesa/pipe/cell/ppu/cell_texture.h b/src/gallium/drivers/cell/ppu/cell_texture.h
index 0264fed88e6..0264fed88e6 100644
--- a/src/mesa/pipe/cell/ppu/cell_texture.h
+++ b/src/gallium/drivers/cell/ppu/cell_texture.h
diff --git a/src/mesa/pipe/cell/ppu/cell_vbuf.c b/src/gallium/drivers/cell/ppu/cell_vbuf.c
index e9fafe492ee..e9fafe492ee 100644
--- a/src/mesa/pipe/cell/ppu/cell_vbuf.c
+++ b/src/gallium/drivers/cell/ppu/cell_vbuf.c
diff --git a/src/mesa/pipe/cell/ppu/cell_vbuf.h b/src/gallium/drivers/cell/ppu/cell_vbuf.h
index d265cbf7701..d265cbf7701 100644
--- a/src/mesa/pipe/cell/ppu/cell_vbuf.h
+++ b/src/gallium/drivers/cell/ppu/cell_vbuf.h
diff --git a/src/mesa/pipe/cell/ppu/cell_vertex_shader.c b/src/gallium/drivers/cell/ppu/cell_vertex_shader.c
index 80dd500b345..80dd500b345 100644
--- a/src/mesa/pipe/cell/ppu/cell_vertex_shader.c
+++ b/src/gallium/drivers/cell/ppu/cell_vertex_shader.c
diff --git a/src/mesa/pipe/cell/ppu/cell_winsys.c b/src/gallium/drivers/cell/ppu/cell_winsys.c
index ebabce3c8f5..ebabce3c8f5 100644
--- a/src/mesa/pipe/cell/ppu/cell_winsys.c
+++ b/src/gallium/drivers/cell/ppu/cell_winsys.c
diff --git a/src/mesa/pipe/cell/ppu/cell_winsys.h b/src/gallium/drivers/cell/ppu/cell_winsys.h
index ae2af5696b5..ae2af5696b5 100644
--- a/src/mesa/pipe/cell/ppu/cell_winsys.h
+++ b/src/gallium/drivers/cell/ppu/cell_winsys.h
diff --git a/src/mesa/pipe/cell/spu/Makefile b/src/gallium/drivers/cell/spu/Makefile
index f202971d738..f202971d738 100644
--- a/src/mesa/pipe/cell/spu/Makefile
+++ b/src/gallium/drivers/cell/spu/Makefile
diff --git a/src/mesa/pipe/cell/spu/spu_blend.c b/src/gallium/drivers/cell/spu/spu_blend.c
index 23ec0eeb451..23ec0eeb451 100644
--- a/src/mesa/pipe/cell/spu/spu_blend.c
+++ b/src/gallium/drivers/cell/spu/spu_blend.c
diff --git a/src/mesa/pipe/cell/spu/spu_blend.h b/src/gallium/drivers/cell/spu/spu_blend.h
index 2b594b578b4..2b594b578b4 100644
--- a/src/mesa/pipe/cell/spu/spu_blend.h
+++ b/src/gallium/drivers/cell/spu/spu_blend.h
diff --git a/src/mesa/pipe/cell/spu/spu_colorpack.h b/src/gallium/drivers/cell/spu/spu_colorpack.h
index e9fee8a3a61..e9fee8a3a61 100644
--- a/src/mesa/pipe/cell/spu/spu_colorpack.h
+++ b/src/gallium/drivers/cell/spu/spu_colorpack.h
diff --git a/src/mesa/pipe/cell/spu/spu_exec.c b/src/gallium/drivers/cell/spu/spu_exec.c
index e51008b9b3c..e51008b9b3c 100644
--- a/src/mesa/pipe/cell/spu/spu_exec.c
+++ b/src/gallium/drivers/cell/spu/spu_exec.c
diff --git a/src/mesa/pipe/cell/spu/spu_exec.h b/src/gallium/drivers/cell/spu/spu_exec.h
index b4c7661ef67..b4c7661ef67 100644
--- a/src/mesa/pipe/cell/spu/spu_exec.h
+++ b/src/gallium/drivers/cell/spu/spu_exec.h
diff --git a/src/mesa/pipe/cell/spu/spu_main.c b/src/gallium/drivers/cell/spu/spu_main.c
index e375197fe60..e375197fe60 100644
--- a/src/mesa/pipe/cell/spu/spu_main.c
+++ b/src/gallium/drivers/cell/spu/spu_main.c
diff --git a/src/mesa/pipe/cell/spu/spu_main.h b/src/gallium/drivers/cell/spu/spu_main.h
index 1710a175123..1710a175123 100644
--- a/src/mesa/pipe/cell/spu/spu_main.h
+++ b/src/gallium/drivers/cell/spu/spu_main.h
diff --git a/src/mesa/pipe/cell/spu/spu_render.c b/src/gallium/drivers/cell/spu/spu_render.c
index 932fb500b3f..932fb500b3f 100644
--- a/src/mesa/pipe/cell/spu/spu_render.c
+++ b/src/gallium/drivers/cell/spu/spu_render.c
diff --git a/src/mesa/pipe/cell/spu/spu_render.h b/src/gallium/drivers/cell/spu/spu_render.h
index fbcdc5ec316..fbcdc5ec316 100644
--- a/src/mesa/pipe/cell/spu/spu_render.h
+++ b/src/gallium/drivers/cell/spu/spu_render.h
diff --git a/src/mesa/pipe/cell/spu/spu_texture.c b/src/gallium/drivers/cell/spu/spu_texture.c
index 3962aaa4a9b..3962aaa4a9b 100644
--- a/src/mesa/pipe/cell/spu/spu_texture.c
+++ b/src/gallium/drivers/cell/spu/spu_texture.c
diff --git a/src/mesa/pipe/cell/spu/spu_texture.h b/src/gallium/drivers/cell/spu/spu_texture.h
index 95eb87080f1..95eb87080f1 100644
--- a/src/mesa/pipe/cell/spu/spu_texture.h
+++ b/src/gallium/drivers/cell/spu/spu_texture.h
diff --git a/src/mesa/pipe/cell/spu/spu_tile.c b/src/gallium/drivers/cell/spu/spu_tile.c
index 12dc2463283..12dc2463283 100644
--- a/src/mesa/pipe/cell/spu/spu_tile.c
+++ b/src/gallium/drivers/cell/spu/spu_tile.c
diff --git a/src/mesa/pipe/cell/spu/spu_tile.h b/src/gallium/drivers/cell/spu/spu_tile.h
index e53340a55a4..e53340a55a4 100644
--- a/src/mesa/pipe/cell/spu/spu_tile.h
+++ b/src/gallium/drivers/cell/spu/spu_tile.h
diff --git a/src/mesa/pipe/cell/spu/spu_tri.c b/src/gallium/drivers/cell/spu/spu_tri.c
index be9624cf7d9..be9624cf7d9 100644
--- a/src/mesa/pipe/cell/spu/spu_tri.c
+++ b/src/gallium/drivers/cell/spu/spu_tri.c
diff --git a/src/mesa/pipe/cell/spu/spu_tri.h b/src/gallium/drivers/cell/spu/spu_tri.h
index aa694dd7c93..aa694dd7c93 100644
--- a/src/mesa/pipe/cell/spu/spu_tri.h
+++ b/src/gallium/drivers/cell/spu/spu_tri.h
diff --git a/src/mesa/pipe/cell/spu/spu_util.c b/src/gallium/drivers/cell/spu/spu_util.c
index ac373240c1f..ac373240c1f 100644
--- a/src/mesa/pipe/cell/spu/spu_util.c
+++ b/src/gallium/drivers/cell/spu/spu_util.c
diff --git a/src/mesa/pipe/cell/spu/spu_vertex_fetch.c b/src/gallium/drivers/cell/spu/spu_vertex_fetch.c
index 45e3c26c001..45e3c26c001 100644
--- a/src/mesa/pipe/cell/spu/spu_vertex_fetch.c
+++ b/src/gallium/drivers/cell/spu/spu_vertex_fetch.c
diff --git a/src/mesa/pipe/cell/spu/spu_vertex_shader.c b/src/gallium/drivers/cell/spu/spu_vertex_shader.c
index c1cbbb6d1e9..c1cbbb6d1e9 100644
--- a/src/mesa/pipe/cell/spu/spu_vertex_shader.c
+++ b/src/gallium/drivers/cell/spu/spu_vertex_shader.c
diff --git a/src/mesa/pipe/cell/spu/spu_vertex_shader.h b/src/gallium/drivers/cell/spu/spu_vertex_shader.h
index b5bf31e67db..b5bf31e67db 100644
--- a/src/mesa/pipe/cell/spu/spu_vertex_shader.h
+++ b/src/gallium/drivers/cell/spu/spu_vertex_shader.h
diff --git a/src/mesa/pipe/cell/spu/spu_ztest.h b/src/gallium/drivers/cell/spu/spu_ztest.h
index ce8ad003393..ce8ad003393 100644
--- a/src/mesa/pipe/cell/spu/spu_ztest.h
+++ b/src/gallium/drivers/cell/spu/spu_ztest.h
diff --git a/src/mesa/pipe/failover/Makefile b/src/gallium/drivers/failover/Makefile
index 72d0895c74d..72d0895c74d 100644
--- a/src/mesa/pipe/failover/Makefile
+++ b/src/gallium/drivers/failover/Makefile
diff --git a/src/mesa/pipe/failover/fo_context.c b/src/gallium/drivers/failover/fo_context.c
index 7ce4a7df17e..7ce4a7df17e 100644
--- a/src/mesa/pipe/failover/fo_context.c
+++ b/src/gallium/drivers/failover/fo_context.c
diff --git a/src/mesa/pipe/failover/fo_context.h b/src/gallium/drivers/failover/fo_context.h
index 1dc87291c9f..1dc87291c9f 100644
--- a/src/mesa/pipe/failover/fo_context.h
+++ b/src/gallium/drivers/failover/fo_context.h
diff --git a/src/mesa/pipe/failover/fo_state.c b/src/gallium/drivers/failover/fo_state.c
index 0fc5568da11..0fc5568da11 100644
--- a/src/mesa/pipe/failover/fo_state.c
+++ b/src/gallium/drivers/failover/fo_state.c
diff --git a/src/mesa/pipe/failover/fo_state_emit.c b/src/gallium/drivers/failover/fo_state_emit.c
index c663dd49476..c663dd49476 100644
--- a/src/mesa/pipe/failover/fo_state_emit.c
+++ b/src/gallium/drivers/failover/fo_state_emit.c
diff --git a/src/mesa/pipe/failover/fo_winsys.h b/src/gallium/drivers/failover/fo_winsys.h
index a8ce997a1f6..a8ce997a1f6 100644
--- a/src/mesa/pipe/failover/fo_winsys.h
+++ b/src/gallium/drivers/failover/fo_winsys.h
diff --git a/src/mesa/pipe/i915simple/Makefile b/src/gallium/drivers/i915simple/Makefile
index 2f91de3afc6..2f91de3afc6 100644
--- a/src/mesa/pipe/i915simple/Makefile
+++ b/src/gallium/drivers/i915simple/Makefile
diff --git a/src/mesa/pipe/i915simple/SConscript b/src/gallium/drivers/i915simple/SConscript
index f5fb96b995c..f5fb96b995c 100644
--- a/src/mesa/pipe/i915simple/SConscript
+++ b/src/gallium/drivers/i915simple/SConscript
diff --git a/src/mesa/pipe/i915simple/i915_batch.h b/src/gallium/drivers/i915simple/i915_batch.h
index fb88cd6db0d..fb88cd6db0d 100644
--- a/src/mesa/pipe/i915simple/i915_batch.h
+++ b/src/gallium/drivers/i915simple/i915_batch.h
diff --git a/src/mesa/pipe/i915simple/i915_blit.c b/src/gallium/drivers/i915simple/i915_blit.c
index db4671ff553..db4671ff553 100644
--- a/src/mesa/pipe/i915simple/i915_blit.c
+++ b/src/gallium/drivers/i915simple/i915_blit.c
diff --git a/src/mesa/pipe/i915simple/i915_blit.h b/src/gallium/drivers/i915simple/i915_blit.h
index 6e5b44e1247..6e5b44e1247 100644
--- a/src/mesa/pipe/i915simple/i915_blit.h
+++ b/src/gallium/drivers/i915simple/i915_blit.h
diff --git a/src/mesa/pipe/i915simple/i915_clear.c b/src/gallium/drivers/i915simple/i915_clear.c
index cde69daacc0..cde69daacc0 100644
--- a/src/mesa/pipe/i915simple/i915_clear.c
+++ b/src/gallium/drivers/i915simple/i915_clear.c
diff --git a/src/mesa/pipe/i915simple/i915_context.c b/src/gallium/drivers/i915simple/i915_context.c
index 497623a7006..497623a7006 100644
--- a/src/mesa/pipe/i915simple/i915_context.c
+++ b/src/gallium/drivers/i915simple/i915_context.c
diff --git a/src/mesa/pipe/i915simple/i915_context.h b/src/gallium/drivers/i915simple/i915_context.h
index b4ea63c3e74..b4ea63c3e74 100644
--- a/src/mesa/pipe/i915simple/i915_context.h
+++ b/src/gallium/drivers/i915simple/i915_context.h
diff --git a/src/mesa/pipe/i915simple/i915_debug.c b/src/gallium/drivers/i915simple/i915_debug.c
index 94db44e1aaf..94db44e1aaf 100644
--- a/src/mesa/pipe/i915simple/i915_debug.c
+++ b/src/gallium/drivers/i915simple/i915_debug.c
diff --git a/src/mesa/pipe/i915simple/i915_debug.h b/src/gallium/drivers/i915simple/i915_debug.h
index 0bcd0942334..0bcd0942334 100644
--- a/src/mesa/pipe/i915simple/i915_debug.h
+++ b/src/gallium/drivers/i915simple/i915_debug.h
diff --git a/src/mesa/pipe/i915simple/i915_debug_fp.c b/src/gallium/drivers/i915simple/i915_debug_fp.c
index ebfdb3d93c5..ebfdb3d93c5 100644
--- a/src/mesa/pipe/i915simple/i915_debug_fp.c
+++ b/src/gallium/drivers/i915simple/i915_debug_fp.c
diff --git a/src/mesa/pipe/i915simple/i915_flush.c b/src/gallium/drivers/i915simple/i915_flush.c
index 3c2069b8273..3c2069b8273 100644
--- a/src/mesa/pipe/i915simple/i915_flush.c
+++ b/src/gallium/drivers/i915simple/i915_flush.c
diff --git a/src/mesa/pipe/i915simple/i915_fpc.h b/src/gallium/drivers/i915simple/i915_fpc.h
index 8c7b68aefb5..8c7b68aefb5 100644
--- a/src/mesa/pipe/i915simple/i915_fpc.h
+++ b/src/gallium/drivers/i915simple/i915_fpc.h
diff --git a/src/mesa/pipe/i915simple/i915_fpc_emit.c b/src/gallium/drivers/i915simple/i915_fpc_emit.c
index 74924ff0a1d..74924ff0a1d 100644
--- a/src/mesa/pipe/i915simple/i915_fpc_emit.c
+++ b/src/gallium/drivers/i915simple/i915_fpc_emit.c
diff --git a/src/mesa/pipe/i915simple/i915_fpc_translate.c b/src/gallium/drivers/i915simple/i915_fpc_translate.c
index 868f0c7e046..868f0c7e046 100644
--- a/src/mesa/pipe/i915simple/i915_fpc_translate.c
+++ b/src/gallium/drivers/i915simple/i915_fpc_translate.c
diff --git a/src/mesa/pipe/i915simple/i915_prim_emit.c b/src/gallium/drivers/i915simple/i915_prim_emit.c
index c4a706c37d8..c4a706c37d8 100644
--- a/src/mesa/pipe/i915simple/i915_prim_emit.c
+++ b/src/gallium/drivers/i915simple/i915_prim_emit.c
diff --git a/src/mesa/pipe/i915simple/i915_prim_vbuf.c b/src/gallium/drivers/i915simple/i915_prim_vbuf.c
index e069773fd4e..e069773fd4e 100644
--- a/src/mesa/pipe/i915simple/i915_prim_vbuf.c
+++ b/src/gallium/drivers/i915simple/i915_prim_vbuf.c
diff --git a/src/mesa/pipe/i915simple/i915_reg.h b/src/gallium/drivers/i915simple/i915_reg.h
index 04620fec681..04620fec681 100644
--- a/src/mesa/pipe/i915simple/i915_reg.h
+++ b/src/gallium/drivers/i915simple/i915_reg.h
diff --git a/src/mesa/pipe/i915simple/i915_state.c b/src/gallium/drivers/i915simple/i915_state.c
index abd5571b885..abd5571b885 100644
--- a/src/mesa/pipe/i915simple/i915_state.c
+++ b/src/gallium/drivers/i915simple/i915_state.c
diff --git a/src/mesa/pipe/i915simple/i915_state.h b/src/gallium/drivers/i915simple/i915_state.h
index 86c6b0027d5..86c6b0027d5 100644
--- a/src/mesa/pipe/i915simple/i915_state.h
+++ b/src/gallium/drivers/i915simple/i915_state.h
diff --git a/src/mesa/pipe/i915simple/i915_state_derived.c b/src/gallium/drivers/i915simple/i915_state_derived.c
index 653983e4a99..653983e4a99 100644
--- a/src/mesa/pipe/i915simple/i915_state_derived.c
+++ b/src/gallium/drivers/i915simple/i915_state_derived.c
diff --git a/src/mesa/pipe/i915simple/i915_state_dynamic.c b/src/gallium/drivers/i915simple/i915_state_dynamic.c
index 8cfbdddd19b..8cfbdddd19b 100644
--- a/src/mesa/pipe/i915simple/i915_state_dynamic.c
+++ b/src/gallium/drivers/i915simple/i915_state_dynamic.c
diff --git a/src/mesa/pipe/i915simple/i915_state_emit.c b/src/gallium/drivers/i915simple/i915_state_emit.c
index 3339287f498..3339287f498 100644
--- a/src/mesa/pipe/i915simple/i915_state_emit.c
+++ b/src/gallium/drivers/i915simple/i915_state_emit.c
diff --git a/src/mesa/pipe/i915simple/i915_state_immediate.c b/src/gallium/drivers/i915simple/i915_state_immediate.c
index 07031fc6c5b..07031fc6c5b 100644
--- a/src/mesa/pipe/i915simple/i915_state_immediate.c
+++ b/src/gallium/drivers/i915simple/i915_state_immediate.c
diff --git a/src/mesa/pipe/i915simple/i915_state_inlines.h b/src/gallium/drivers/i915simple/i915_state_inlines.h
index 0934ac79a41..0934ac79a41 100644
--- a/src/mesa/pipe/i915simple/i915_state_inlines.h
+++ b/src/gallium/drivers/i915simple/i915_state_inlines.h
diff --git a/src/mesa/pipe/i915simple/i915_state_sampler.c b/src/gallium/drivers/i915simple/i915_state_sampler.c
index 9c1a5bbbd65..9c1a5bbbd65 100644
--- a/src/mesa/pipe/i915simple/i915_state_sampler.c
+++ b/src/gallium/drivers/i915simple/i915_state_sampler.c
diff --git a/src/mesa/pipe/i915simple/i915_strings.c b/src/gallium/drivers/i915simple/i915_strings.c
index c713bf72086..c713bf72086 100644
--- a/src/mesa/pipe/i915simple/i915_strings.c
+++ b/src/gallium/drivers/i915simple/i915_strings.c
diff --git a/src/mesa/pipe/i915simple/i915_surface.c b/src/gallium/drivers/i915simple/i915_surface.c
index de0cc5fe06a..de0cc5fe06a 100644
--- a/src/mesa/pipe/i915simple/i915_surface.c
+++ b/src/gallium/drivers/i915simple/i915_surface.c
diff --git a/src/mesa/pipe/i915simple/i915_texture.c b/src/gallium/drivers/i915simple/i915_texture.c
index 6d37ae3d747..6d37ae3d747 100644
--- a/src/mesa/pipe/i915simple/i915_texture.c
+++ b/src/gallium/drivers/i915simple/i915_texture.c
diff --git a/src/mesa/pipe/i915simple/i915_texture.h b/src/gallium/drivers/i915simple/i915_texture.h
index 330d111dc78..330d111dc78 100644
--- a/src/mesa/pipe/i915simple/i915_texture.h
+++ b/src/gallium/drivers/i915simple/i915_texture.h
diff --git a/src/mesa/pipe/i915simple/i915_winsys.h b/src/gallium/drivers/i915simple/i915_winsys.h
index fe49710852b..fe49710852b 100644
--- a/src/mesa/pipe/i915simple/i915_winsys.h
+++ b/src/gallium/drivers/i915simple/i915_winsys.h
diff --git a/src/mesa/pipe/i965simple/Makefile b/src/gallium/drivers/i965simple/Makefile
index 48c00ab50b8..48c00ab50b8 100644
--- a/src/mesa/pipe/i965simple/Makefile
+++ b/src/gallium/drivers/i965simple/Makefile
diff --git a/src/mesa/pipe/i965simple/SConscript b/src/gallium/drivers/i965simple/SConscript
index 74621de84c9..74621de84c9 100644
--- a/src/mesa/pipe/i965simple/SConscript
+++ b/src/gallium/drivers/i965simple/SConscript
diff --git a/src/mesa/pipe/i965simple/brw_batch.h b/src/gallium/drivers/i965simple/brw_batch.h
index 5f5932a4883..5f5932a4883 100644
--- a/src/mesa/pipe/i965simple/brw_batch.h
+++ b/src/gallium/drivers/i965simple/brw_batch.h
diff --git a/src/mesa/pipe/i965simple/brw_blit.c b/src/gallium/drivers/i965simple/brw_blit.c
index 8494f70493c..8494f70493c 100644
--- a/src/mesa/pipe/i965simple/brw_blit.c
+++ b/src/gallium/drivers/i965simple/brw_blit.c
diff --git a/src/mesa/pipe/i965simple/brw_blit.h b/src/gallium/drivers/i965simple/brw_blit.h
index 111c5d91d39..111c5d91d39 100644
--- a/src/mesa/pipe/i965simple/brw_blit.h
+++ b/src/gallium/drivers/i965simple/brw_blit.h
diff --git a/src/mesa/pipe/i965simple/brw_cc.c b/src/gallium/drivers/i965simple/brw_cc.c
index 337e4f95f69..337e4f95f69 100644
--- a/src/mesa/pipe/i965simple/brw_cc.c
+++ b/src/gallium/drivers/i965simple/brw_cc.c
diff --git a/src/mesa/pipe/i965simple/brw_clip.c b/src/gallium/drivers/i965simple/brw_clip.c
index 268124cc53f..268124cc53f 100644
--- a/src/mesa/pipe/i965simple/brw_clip.c
+++ b/src/gallium/drivers/i965simple/brw_clip.c
diff --git a/src/mesa/pipe/i965simple/brw_clip.h b/src/gallium/drivers/i965simple/brw_clip.h
index a89d08b7910..a89d08b7910 100644
--- a/src/mesa/pipe/i965simple/brw_clip.h
+++ b/src/gallium/drivers/i965simple/brw_clip.h
diff --git a/src/mesa/pipe/i965simple/brw_clip_line.c b/src/gallium/drivers/i965simple/brw_clip_line.c
index 75d9e5fcda2..75d9e5fcda2 100644
--- a/src/mesa/pipe/i965simple/brw_clip_line.c
+++ b/src/gallium/drivers/i965simple/brw_clip_line.c
diff --git a/src/mesa/pipe/i965simple/brw_clip_point.c b/src/gallium/drivers/i965simple/brw_clip_point.c
index 6fce7210d1b..6fce7210d1b 100644
--- a/src/mesa/pipe/i965simple/brw_clip_point.c
+++ b/src/gallium/drivers/i965simple/brw_clip_point.c
diff --git a/src/mesa/pipe/i965simple/brw_clip_state.c b/src/gallium/drivers/i965simple/brw_clip_state.c
index ea5c05a2796..ea5c05a2796 100644
--- a/src/mesa/pipe/i965simple/brw_clip_state.c
+++ b/src/gallium/drivers/i965simple/brw_clip_state.c
diff --git a/src/mesa/pipe/i965simple/brw_clip_tri.c b/src/gallium/drivers/i965simple/brw_clip_tri.c
index c5da7b825e0..c5da7b825e0 100644
--- a/src/mesa/pipe/i965simple/brw_clip_tri.c
+++ b/src/gallium/drivers/i965simple/brw_clip_tri.c
diff --git a/src/mesa/pipe/i965simple/brw_clip_unfilled.c b/src/gallium/drivers/i965simple/brw_clip_unfilled.c
index b774a76dd63..b774a76dd63 100644
--- a/src/mesa/pipe/i965simple/brw_clip_unfilled.c
+++ b/src/gallium/drivers/i965simple/brw_clip_unfilled.c
diff --git a/src/mesa/pipe/i965simple/brw_clip_util.c b/src/gallium/drivers/i965simple/brw_clip_util.c
index 6d58ceafff3..6d58ceafff3 100644
--- a/src/mesa/pipe/i965simple/brw_clip_util.c
+++ b/src/gallium/drivers/i965simple/brw_clip_util.c
diff --git a/src/mesa/pipe/i965simple/brw_context.c b/src/gallium/drivers/i965simple/brw_context.c
index 5e58701e91c..5e58701e91c 100644
--- a/src/mesa/pipe/i965simple/brw_context.c
+++ b/src/gallium/drivers/i965simple/brw_context.c
diff --git a/src/mesa/pipe/i965simple/brw_context.h b/src/gallium/drivers/i965simple/brw_context.h
index 65664d853dd..65664d853dd 100644
--- a/src/mesa/pipe/i965simple/brw_context.h
+++ b/src/gallium/drivers/i965simple/brw_context.h
diff --git a/src/mesa/pipe/i965simple/brw_curbe.c b/src/gallium/drivers/i965simple/brw_curbe.c
index 52bbd525c16..52bbd525c16 100644
--- a/src/mesa/pipe/i965simple/brw_curbe.c
+++ b/src/gallium/drivers/i965simple/brw_curbe.c
diff --git a/src/mesa/pipe/i965simple/brw_defines.h b/src/gallium/drivers/i965simple/brw_defines.h
index 9379a397f63..9379a397f63 100644
--- a/src/mesa/pipe/i965simple/brw_defines.h
+++ b/src/gallium/drivers/i965simple/brw_defines.h
diff --git a/src/mesa/pipe/i965simple/brw_draw.c b/src/gallium/drivers/i965simple/brw_draw.c
index 7598e3dc8af..7598e3dc8af 100644
--- a/src/mesa/pipe/i965simple/brw_draw.c
+++ b/src/gallium/drivers/i965simple/brw_draw.c
diff --git a/src/mesa/pipe/i965simple/brw_draw.h b/src/gallium/drivers/i965simple/brw_draw.h
index 62fe0d5d0ee..62fe0d5d0ee 100644
--- a/src/mesa/pipe/i965simple/brw_draw.h
+++ b/src/gallium/drivers/i965simple/brw_draw.h
diff --git a/src/mesa/pipe/i965simple/brw_draw_upload.c b/src/gallium/drivers/i965simple/brw_draw_upload.c
index aa85d93866a..aa85d93866a 100644
--- a/src/mesa/pipe/i965simple/brw_draw_upload.c
+++ b/src/gallium/drivers/i965simple/brw_draw_upload.c
diff --git a/src/mesa/pipe/i965simple/brw_eu.c b/src/gallium/drivers/i965simple/brw_eu.c
index e2002d1821f..e2002d1821f 100644
--- a/src/mesa/pipe/i965simple/brw_eu.c
+++ b/src/gallium/drivers/i965simple/brw_eu.c
diff --git a/src/mesa/pipe/i965simple/brw_eu.h b/src/gallium/drivers/i965simple/brw_eu.h
index 23151ae9ed6..23151ae9ed6 100644
--- a/src/mesa/pipe/i965simple/brw_eu.h
+++ b/src/gallium/drivers/i965simple/brw_eu.h
diff --git a/src/mesa/pipe/i965simple/brw_eu_debug.c b/src/gallium/drivers/i965simple/brw_eu_debug.c
index 4a94ddefa6a..4a94ddefa6a 100644
--- a/src/mesa/pipe/i965simple/brw_eu_debug.c
+++ b/src/gallium/drivers/i965simple/brw_eu_debug.c
diff --git a/src/mesa/pipe/i965simple/brw_eu_emit.c b/src/gallium/drivers/i965simple/brw_eu_emit.c
index 400a80b6fba..400a80b6fba 100644
--- a/src/mesa/pipe/i965simple/brw_eu_emit.c
+++ b/src/gallium/drivers/i965simple/brw_eu_emit.c
diff --git a/src/mesa/pipe/i965simple/brw_eu_util.c b/src/gallium/drivers/i965simple/brw_eu_util.c
index 3a65b141f07..3a65b141f07 100644
--- a/src/mesa/pipe/i965simple/brw_eu_util.c
+++ b/src/gallium/drivers/i965simple/brw_eu_util.c
diff --git a/src/mesa/pipe/i965simple/brw_flush.c b/src/gallium/drivers/i965simple/brw_flush.c
index 5216c680cf6..5216c680cf6 100644
--- a/src/mesa/pipe/i965simple/brw_flush.c
+++ b/src/gallium/drivers/i965simple/brw_flush.c
diff --git a/src/mesa/pipe/i965simple/brw_gs.c b/src/gallium/drivers/i965simple/brw_gs.c
index de60868ccca..de60868ccca 100644
--- a/src/mesa/pipe/i965simple/brw_gs.c
+++ b/src/gallium/drivers/i965simple/brw_gs.c
diff --git a/src/mesa/pipe/i965simple/brw_gs.h b/src/gallium/drivers/i965simple/brw_gs.h
index f09141c6aa1..f09141c6aa1 100644
--- a/src/mesa/pipe/i965simple/brw_gs.h
+++ b/src/gallium/drivers/i965simple/brw_gs.h
diff --git a/src/mesa/pipe/i965simple/brw_gs_emit.c b/src/gallium/drivers/i965simple/brw_gs_emit.c
index c3cc90b10f8..c3cc90b10f8 100644
--- a/src/mesa/pipe/i965simple/brw_gs_emit.c
+++ b/src/gallium/drivers/i965simple/brw_gs_emit.c
diff --git a/src/mesa/pipe/i965simple/brw_gs_state.c b/src/gallium/drivers/i965simple/brw_gs_state.c
index 3932e9e9394..3932e9e9394 100644
--- a/src/mesa/pipe/i965simple/brw_gs_state.c
+++ b/src/gallium/drivers/i965simple/brw_gs_state.c
diff --git a/src/mesa/pipe/i965simple/brw_misc_state.c b/src/gallium/drivers/i965simple/brw_misc_state.c
index 925049ecc19..925049ecc19 100644
--- a/src/mesa/pipe/i965simple/brw_misc_state.c
+++ b/src/gallium/drivers/i965simple/brw_misc_state.c
diff --git a/src/mesa/pipe/i965simple/brw_reg.h b/src/gallium/drivers/i965simple/brw_reg.h
index 9e885c3b3b7..9e885c3b3b7 100644
--- a/src/mesa/pipe/i965simple/brw_reg.h
+++ b/src/gallium/drivers/i965simple/brw_reg.h
diff --git a/src/mesa/pipe/i965simple/brw_sf.c b/src/gallium/drivers/i965simple/brw_sf.c
index 7c83b81c858..7c83b81c858 100644
--- a/src/mesa/pipe/i965simple/brw_sf.c
+++ b/src/gallium/drivers/i965simple/brw_sf.c
diff --git a/src/mesa/pipe/i965simple/brw_sf.h b/src/gallium/drivers/i965simple/brw_sf.h
index b7ada475604..b7ada475604 100644
--- a/src/mesa/pipe/i965simple/brw_sf.h
+++ b/src/gallium/drivers/i965simple/brw_sf.h
diff --git a/src/mesa/pipe/i965simple/brw_sf_emit.c b/src/gallium/drivers/i965simple/brw_sf_emit.c
index 78d6fa5e9e5..78d6fa5e9e5 100644
--- a/src/mesa/pipe/i965simple/brw_sf_emit.c
+++ b/src/gallium/drivers/i965simple/brw_sf_emit.c
diff --git a/src/mesa/pipe/i965simple/brw_sf_state.c b/src/gallium/drivers/i965simple/brw_sf_state.c
index 9acd3ea61b2..9acd3ea61b2 100644
--- a/src/mesa/pipe/i965simple/brw_sf_state.c
+++ b/src/gallium/drivers/i965simple/brw_sf_state.c
diff --git a/src/mesa/pipe/i965simple/brw_shader_info.c b/src/gallium/drivers/i965simple/brw_shader_info.c
index 431b45466a6..431b45466a6 100644
--- a/src/mesa/pipe/i965simple/brw_shader_info.c
+++ b/src/gallium/drivers/i965simple/brw_shader_info.c
diff --git a/src/mesa/pipe/i965simple/brw_state.c b/src/gallium/drivers/i965simple/brw_state.c
index 95dfce88e4a..95dfce88e4a 100644
--- a/src/mesa/pipe/i965simple/brw_state.c
+++ b/src/gallium/drivers/i965simple/brw_state.c
diff --git a/src/mesa/pipe/i965simple/brw_state.h b/src/gallium/drivers/i965simple/brw_state.h
index 258e9a556e2..258e9a556e2 100644
--- a/src/mesa/pipe/i965simple/brw_state.h
+++ b/src/gallium/drivers/i965simple/brw_state.h
diff --git a/src/mesa/pipe/i965simple/brw_state_batch.c b/src/gallium/drivers/i965simple/brw_state_batch.c
index 35db76b5941..35db76b5941 100644
--- a/src/mesa/pipe/i965simple/brw_state_batch.c
+++ b/src/gallium/drivers/i965simple/brw_state_batch.c
diff --git a/src/mesa/pipe/i965simple/brw_state_cache.c b/src/gallium/drivers/i965simple/brw_state_cache.c
index b3a5124461d..b3a5124461d 100644
--- a/src/mesa/pipe/i965simple/brw_state_cache.c
+++ b/src/gallium/drivers/i965simple/brw_state_cache.c
diff --git a/src/mesa/pipe/i965simple/brw_state_pool.c b/src/gallium/drivers/i965simple/brw_state_pool.c
index f3174bfe0ae..f3174bfe0ae 100644
--- a/src/mesa/pipe/i965simple/brw_state_pool.c
+++ b/src/gallium/drivers/i965simple/brw_state_pool.c
diff --git a/src/mesa/pipe/i965simple/brw_state_upload.c b/src/gallium/drivers/i965simple/brw_state_upload.c
index e727601e1e7..e727601e1e7 100644
--- a/src/mesa/pipe/i965simple/brw_state_upload.c
+++ b/src/gallium/drivers/i965simple/brw_state_upload.c
diff --git a/src/mesa/pipe/i965simple/brw_strings.c b/src/gallium/drivers/i965simple/brw_strings.c
index 29a41ed1e9b..29a41ed1e9b 100644
--- a/src/mesa/pipe/i965simple/brw_strings.c
+++ b/src/gallium/drivers/i965simple/brw_strings.c
diff --git a/src/mesa/pipe/i965simple/brw_structs.h b/src/gallium/drivers/i965simple/brw_structs.h
index bbb087e95d6..bbb087e95d6 100644
--- a/src/mesa/pipe/i965simple/brw_structs.h
+++ b/src/gallium/drivers/i965simple/brw_structs.h
diff --git a/src/mesa/pipe/i965simple/brw_surface.c b/src/gallium/drivers/i965simple/brw_surface.c
index 518845e4b2e..518845e4b2e 100644
--- a/src/mesa/pipe/i965simple/brw_surface.c
+++ b/src/gallium/drivers/i965simple/brw_surface.c
diff --git a/src/mesa/pipe/i965simple/brw_tex_layout.c b/src/gallium/drivers/i965simple/brw_tex_layout.c
index 90561f1307d..90561f1307d 100644
--- a/src/mesa/pipe/i965simple/brw_tex_layout.c
+++ b/src/gallium/drivers/i965simple/brw_tex_layout.c
diff --git a/src/mesa/pipe/i965simple/brw_tex_layout.h b/src/gallium/drivers/i965simple/brw_tex_layout.h
index cfd6b1ef3ae..cfd6b1ef3ae 100644
--- a/src/mesa/pipe/i965simple/brw_tex_layout.h
+++ b/src/gallium/drivers/i965simple/brw_tex_layout.h
diff --git a/src/mesa/pipe/i965simple/brw_urb.c b/src/gallium/drivers/i965simple/brw_urb.c
index 101a4367b90..101a4367b90 100644
--- a/src/mesa/pipe/i965simple/brw_urb.c
+++ b/src/gallium/drivers/i965simple/brw_urb.c
diff --git a/src/mesa/pipe/i965simple/brw_util.c b/src/gallium/drivers/i965simple/brw_util.c
index 42391d7c8c5..42391d7c8c5 100644
--- a/src/mesa/pipe/i965simple/brw_util.c
+++ b/src/gallium/drivers/i965simple/brw_util.c
diff --git a/src/mesa/pipe/i965simple/brw_util.h b/src/gallium/drivers/i965simple/brw_util.h
index d60e5934dba..d60e5934dba 100644
--- a/src/mesa/pipe/i965simple/brw_util.h
+++ b/src/gallium/drivers/i965simple/brw_util.h
diff --git a/src/mesa/pipe/i965simple/brw_vs.c b/src/gallium/drivers/i965simple/brw_vs.c
index 738c6346d5e..738c6346d5e 100644
--- a/src/mesa/pipe/i965simple/brw_vs.c
+++ b/src/gallium/drivers/i965simple/brw_vs.c
diff --git a/src/mesa/pipe/i965simple/brw_vs.h b/src/gallium/drivers/i965simple/brw_vs.h
index 0e58f043b02..0e58f043b02 100644
--- a/src/mesa/pipe/i965simple/brw_vs.h
+++ b/src/gallium/drivers/i965simple/brw_vs.h
diff --git a/src/mesa/pipe/i965simple/brw_vs_emit.c b/src/gallium/drivers/i965simple/brw_vs_emit.c
index 98915ba1016..98915ba1016 100644
--- a/src/mesa/pipe/i965simple/brw_vs_emit.c
+++ b/src/gallium/drivers/i965simple/brw_vs_emit.c
diff --git a/src/mesa/pipe/i965simple/brw_vs_state.c b/src/gallium/drivers/i965simple/brw_vs_state.c
index c73469929ce..c73469929ce 100644
--- a/src/mesa/pipe/i965simple/brw_vs_state.c
+++ b/src/gallium/drivers/i965simple/brw_vs_state.c
diff --git a/src/mesa/pipe/i965simple/brw_winsys.h b/src/gallium/drivers/i965simple/brw_winsys.h
index 3523a58614f..3523a58614f 100644
--- a/src/mesa/pipe/i965simple/brw_winsys.h
+++ b/src/gallium/drivers/i965simple/brw_winsys.h
diff --git a/src/mesa/pipe/i965simple/brw_wm.c b/src/gallium/drivers/i965simple/brw_wm.c
index 539b1707444..539b1707444 100644
--- a/src/mesa/pipe/i965simple/brw_wm.c
+++ b/src/gallium/drivers/i965simple/brw_wm.c
diff --git a/src/mesa/pipe/i965simple/brw_wm.h b/src/gallium/drivers/i965simple/brw_wm.h
index a1ac0f504a6..a1ac0f504a6 100644
--- a/src/mesa/pipe/i965simple/brw_wm.h
+++ b/src/gallium/drivers/i965simple/brw_wm.h
diff --git a/src/mesa/pipe/i965simple/brw_wm_decl.c b/src/gallium/drivers/i965simple/brw_wm_decl.c
index b45a333a2e9..b45a333a2e9 100644
--- a/src/mesa/pipe/i965simple/brw_wm_decl.c
+++ b/src/gallium/drivers/i965simple/brw_wm_decl.c
diff --git a/src/mesa/pipe/i965simple/brw_wm_glsl.c b/src/gallium/drivers/i965simple/brw_wm_glsl.c
index d95645d1085..d95645d1085 100644
--- a/src/mesa/pipe/i965simple/brw_wm_glsl.c
+++ b/src/gallium/drivers/i965simple/brw_wm_glsl.c
diff --git a/src/mesa/pipe/i965simple/brw_wm_iz.c b/src/gallium/drivers/i965simple/brw_wm_iz.c
index 6c5f25bf39e..6c5f25bf39e 100644
--- a/src/mesa/pipe/i965simple/brw_wm_iz.c
+++ b/src/gallium/drivers/i965simple/brw_wm_iz.c
diff --git a/src/mesa/pipe/i965simple/brw_wm_sampler_state.c b/src/gallium/drivers/i965simple/brw_wm_sampler_state.c
index de42ffc5b1e..de42ffc5b1e 100644
--- a/src/mesa/pipe/i965simple/brw_wm_sampler_state.c
+++ b/src/gallium/drivers/i965simple/brw_wm_sampler_state.c
diff --git a/src/mesa/pipe/i965simple/brw_wm_state.c b/src/gallium/drivers/i965simple/brw_wm_state.c
index 5ccd4888423..5ccd4888423 100644
--- a/src/mesa/pipe/i965simple/brw_wm_state.c
+++ b/src/gallium/drivers/i965simple/brw_wm_state.c
diff --git a/src/mesa/pipe/i965simple/brw_wm_surface_state.c b/src/gallium/drivers/i965simple/brw_wm_surface_state.c
index d16d919bce9..d16d919bce9 100644
--- a/src/mesa/pipe/i965simple/brw_wm_surface_state.c
+++ b/src/gallium/drivers/i965simple/brw_wm_surface_state.c
diff --git a/src/mesa/pipe/softpipe/Makefile b/src/gallium/drivers/softpipe/Makefile
index 31438a882e6..31438a882e6 100644
--- a/src/mesa/pipe/softpipe/Makefile
+++ b/src/gallium/drivers/softpipe/Makefile
diff --git a/src/mesa/pipe/softpipe/SConscript b/src/gallium/drivers/softpipe/SConscript
index d581ee8d3ca..d581ee8d3ca 100644
--- a/src/mesa/pipe/softpipe/SConscript
+++ b/src/gallium/drivers/softpipe/SConscript
diff --git a/src/mesa/pipe/softpipe/sp_clear.c b/src/gallium/drivers/softpipe/sp_clear.c
index 8d295a30ca6..8d295a30ca6 100644
--- a/src/mesa/pipe/softpipe/sp_clear.c
+++ b/src/gallium/drivers/softpipe/sp_clear.c
diff --git a/src/mesa/pipe/softpipe/sp_clear.h b/src/gallium/drivers/softpipe/sp_clear.h
index a8ed1c4ecc4..a8ed1c4ecc4 100644
--- a/src/mesa/pipe/softpipe/sp_clear.h
+++ b/src/gallium/drivers/softpipe/sp_clear.h
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
index cea6b90104f..cea6b90104f 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/gallium/drivers/softpipe/sp_context.c
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/gallium/drivers/softpipe/sp_context.h
index aff8c2cc5dc..aff8c2cc5dc 100644
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/gallium/drivers/softpipe/sp_context.h
diff --git a/src/mesa/pipe/softpipe/sp_draw_arrays.c b/src/gallium/drivers/softpipe/sp_draw_arrays.c
index 71a303a8b58..71a303a8b58 100644
--- a/src/mesa/pipe/softpipe/sp_draw_arrays.c
+++ b/src/gallium/drivers/softpipe/sp_draw_arrays.c
diff --git a/src/mesa/pipe/softpipe/sp_flush.c b/src/gallium/drivers/softpipe/sp_flush.c
index ced0d5d0983..ced0d5d0983 100644
--- a/src/mesa/pipe/softpipe/sp_flush.c
+++ b/src/gallium/drivers/softpipe/sp_flush.c
diff --git a/src/mesa/pipe/softpipe/sp_flush.h b/src/gallium/drivers/softpipe/sp_flush.h
index 34ec617866b..34ec617866b 100644
--- a/src/mesa/pipe/softpipe/sp_flush.h
+++ b/src/gallium/drivers/softpipe/sp_flush.h
diff --git a/src/mesa/pipe/softpipe/sp_headers.h b/src/gallium/drivers/softpipe/sp_headers.h
index 0ae31d87961..0ae31d87961 100644
--- a/src/mesa/pipe/softpipe/sp_headers.h
+++ b/src/gallium/drivers/softpipe/sp_headers.h
diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.c b/src/gallium/drivers/softpipe/sp_prim_setup.c
index 27720486615..27720486615 100644
--- a/src/mesa/pipe/softpipe/sp_prim_setup.c
+++ b/src/gallium/drivers/softpipe/sp_prim_setup.c
diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.h b/src/gallium/drivers/softpipe/sp_prim_setup.h
index f3e8a79dd9e..f3e8a79dd9e 100644
--- a/src/mesa/pipe/softpipe/sp_prim_setup.h
+++ b/src/gallium/drivers/softpipe/sp_prim_setup.h
diff --git a/src/mesa/pipe/softpipe/sp_prim_vbuf.c b/src/gallium/drivers/softpipe/sp_prim_vbuf.c
index 7f71fdb6a9a..7f71fdb6a9a 100644
--- a/src/mesa/pipe/softpipe/sp_prim_vbuf.c
+++ b/src/gallium/drivers/softpipe/sp_prim_vbuf.c
diff --git a/src/mesa/pipe/softpipe/sp_prim_vbuf.h b/src/gallium/drivers/softpipe/sp_prim_vbuf.h
index 1de9cc2a894..1de9cc2a894 100644
--- a/src/mesa/pipe/softpipe/sp_prim_vbuf.h
+++ b/src/gallium/drivers/softpipe/sp_prim_vbuf.h
diff --git a/src/mesa/pipe/softpipe/sp_quad.c b/src/gallium/drivers/softpipe/sp_quad.c
index 6bd468a51cf..6bd468a51cf 100644
--- a/src/mesa/pipe/softpipe/sp_quad.c
+++ b/src/gallium/drivers/softpipe/sp_quad.c
diff --git a/src/mesa/pipe/softpipe/sp_quad.h b/src/gallium/drivers/softpipe/sp_quad.h
index f1e0281764f..f1e0281764f 100644
--- a/src/mesa/pipe/softpipe/sp_quad.h
+++ b/src/gallium/drivers/softpipe/sp_quad.h
diff --git a/src/mesa/pipe/softpipe/sp_quad_alpha_test.c b/src/gallium/drivers/softpipe/sp_quad_alpha_test.c
index 4ffeac35e16..4ffeac35e16 100644
--- a/src/mesa/pipe/softpipe/sp_quad_alpha_test.c
+++ b/src/gallium/drivers/softpipe/sp_quad_alpha_test.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_blend.c b/src/gallium/drivers/softpipe/sp_quad_blend.c
index 17f3ecd0b83..17f3ecd0b83 100644
--- a/src/mesa/pipe/softpipe/sp_quad_blend.c
+++ b/src/gallium/drivers/softpipe/sp_quad_blend.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_bufloop.c b/src/gallium/drivers/softpipe/sp_quad_bufloop.c
index 2ae4e22a7de..2ae4e22a7de 100644
--- a/src/mesa/pipe/softpipe/sp_quad_bufloop.c
+++ b/src/gallium/drivers/softpipe/sp_quad_bufloop.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_colormask.c b/src/gallium/drivers/softpipe/sp_quad_colormask.c
index 1f09d900ca8..1f09d900ca8 100644
--- a/src/mesa/pipe/softpipe/sp_quad_colormask.c
+++ b/src/gallium/drivers/softpipe/sp_quad_colormask.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_coverage.c b/src/gallium/drivers/softpipe/sp_quad_coverage.c
index b3d3fae22fd..b3d3fae22fd 100644
--- a/src/mesa/pipe/softpipe/sp_quad_coverage.c
+++ b/src/gallium/drivers/softpipe/sp_quad_coverage.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_depth_test.c b/src/gallium/drivers/softpipe/sp_quad_depth_test.c
index a9a0754f279..a9a0754f279 100644
--- a/src/mesa/pipe/softpipe/sp_quad_depth_test.c
+++ b/src/gallium/drivers/softpipe/sp_quad_depth_test.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_earlyz.c b/src/gallium/drivers/softpipe/sp_quad_earlyz.c
index 22ea99049fe..22ea99049fe 100644
--- a/src/mesa/pipe/softpipe/sp_quad_earlyz.c
+++ b/src/gallium/drivers/softpipe/sp_quad_earlyz.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/gallium/drivers/softpipe/sp_quad_fs.c
index 33168584137..33168584137 100644
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/gallium/drivers/softpipe/sp_quad_fs.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_occlusion.c b/src/gallium/drivers/softpipe/sp_quad_occlusion.c
index 54254df1f11..54254df1f11 100644
--- a/src/mesa/pipe/softpipe/sp_quad_occlusion.c
+++ b/src/gallium/drivers/softpipe/sp_quad_occlusion.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_output.c b/src/gallium/drivers/softpipe/sp_quad_output.c
index cfe8f118081..cfe8f118081 100644
--- a/src/mesa/pipe/softpipe/sp_quad_output.c
+++ b/src/gallium/drivers/softpipe/sp_quad_output.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_stencil.c b/src/gallium/drivers/softpipe/sp_quad_stencil.c
index 92a0da00833..92a0da00833 100644
--- a/src/mesa/pipe/softpipe/sp_quad_stencil.c
+++ b/src/gallium/drivers/softpipe/sp_quad_stencil.c
diff --git a/src/mesa/pipe/softpipe/sp_quad_stipple.c b/src/gallium/drivers/softpipe/sp_quad_stipple.c
index 8660432259c..8660432259c 100644
--- a/src/mesa/pipe/softpipe/sp_quad_stipple.c
+++ b/src/gallium/drivers/softpipe/sp_quad_stipple.c
diff --git a/src/mesa/pipe/softpipe/sp_query.c b/src/gallium/drivers/softpipe/sp_query.c
index 6a8a43aedaf..6a8a43aedaf 100644
--- a/src/mesa/pipe/softpipe/sp_query.c
+++ b/src/gallium/drivers/softpipe/sp_query.c
diff --git a/src/mesa/pipe/softpipe/sp_query.h b/src/gallium/drivers/softpipe/sp_query.h
index 05060a45759..05060a45759 100644
--- a/src/mesa/pipe/softpipe/sp_query.h
+++ b/src/gallium/drivers/softpipe/sp_query.h
diff --git a/src/mesa/pipe/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
index b79db0d1f19..b79db0d1f19 100644
--- a/src/mesa/pipe/softpipe/sp_state.h
+++ b/src/gallium/drivers/softpipe/sp_state.h
diff --git a/src/mesa/pipe/softpipe/sp_state_blend.c b/src/gallium/drivers/softpipe/sp_state_blend.c
index 2d40d6bd8f5..2d40d6bd8f5 100644
--- a/src/mesa/pipe/softpipe/sp_state_blend.c
+++ b/src/gallium/drivers/softpipe/sp_state_blend.c
diff --git a/src/mesa/pipe/softpipe/sp_state_clip.c b/src/gallium/drivers/softpipe/sp_state_clip.c
index 08c5f06d05d..08c5f06d05d 100644
--- a/src/mesa/pipe/softpipe/sp_state_clip.c
+++ b/src/gallium/drivers/softpipe/sp_state_clip.c
diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/gallium/drivers/softpipe/sp_state_derived.c
index 372597869f3..372597869f3 100644
--- a/src/mesa/pipe/softpipe/sp_state_derived.c
+++ b/src/gallium/drivers/softpipe/sp_state_derived.c
diff --git a/src/mesa/pipe/softpipe/sp_state_fs.c b/src/gallium/drivers/softpipe/sp_state_fs.c
index 0b814fc2847..0b814fc2847 100644
--- a/src/mesa/pipe/softpipe/sp_state_fs.c
+++ b/src/gallium/drivers/softpipe/sp_state_fs.c
diff --git a/src/mesa/pipe/softpipe/sp_state_rasterizer.c b/src/gallium/drivers/softpipe/sp_state_rasterizer.c
index 53755099dde..53755099dde 100644
--- a/src/mesa/pipe/softpipe/sp_state_rasterizer.c
+++ b/src/gallium/drivers/softpipe/sp_state_rasterizer.c
diff --git a/src/mesa/pipe/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c
index ea348c7e958..ea348c7e958 100644
--- a/src/mesa/pipe/softpipe/sp_state_sampler.c
+++ b/src/gallium/drivers/softpipe/sp_state_sampler.c
diff --git a/src/mesa/pipe/softpipe/sp_state_surface.c b/src/gallium/drivers/softpipe/sp_state_surface.c
index e2c6893e9f5..e2c6893e9f5 100644
--- a/src/mesa/pipe/softpipe/sp_state_surface.c
+++ b/src/gallium/drivers/softpipe/sp_state_surface.c
diff --git a/src/mesa/pipe/softpipe/sp_state_vertex.c b/src/gallium/drivers/softpipe/sp_state_vertex.c
index 09ff540ccfd..09ff540ccfd 100644
--- a/src/mesa/pipe/softpipe/sp_state_vertex.c
+++ b/src/gallium/drivers/softpipe/sp_state_vertex.c
diff --git a/src/mesa/pipe/softpipe/sp_surface.c b/src/gallium/drivers/softpipe/sp_surface.c
index 8802ced1874..8802ced1874 100644
--- a/src/mesa/pipe/softpipe/sp_surface.c
+++ b/src/gallium/drivers/softpipe/sp_surface.c
diff --git a/src/mesa/pipe/softpipe/sp_surface.h b/src/gallium/drivers/softpipe/sp_surface.h
index 22de3ba43f6..22de3ba43f6 100644
--- a/src/mesa/pipe/softpipe/sp_surface.h
+++ b/src/gallium/drivers/softpipe/sp_surface.h
diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c
index 325bdb86da5..325bdb86da5 100644
--- a/src/mesa/pipe/softpipe/sp_tex_sample.c
+++ b/src/gallium/drivers/softpipe/sp_tex_sample.c
diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.h b/src/gallium/drivers/softpipe/sp_tex_sample.h
index 404bfd0c365..404bfd0c365 100644
--- a/src/mesa/pipe/softpipe/sp_tex_sample.h
+++ b/src/gallium/drivers/softpipe/sp_tex_sample.h
diff --git a/src/mesa/pipe/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c
index 6de7a9b543b..6de7a9b543b 100644
--- a/src/mesa/pipe/softpipe/sp_texture.c
+++ b/src/gallium/drivers/softpipe/sp_texture.c
diff --git a/src/mesa/pipe/softpipe/sp_texture.h b/src/gallium/drivers/softpipe/sp_texture.h
index fa646c0de9f..fa646c0de9f 100644
--- a/src/mesa/pipe/softpipe/sp_texture.h
+++ b/src/gallium/drivers/softpipe/sp_texture.h
diff --git a/src/mesa/pipe/softpipe/sp_tile_cache.c b/src/gallium/drivers/softpipe/sp_tile_cache.c
index 1597361b82f..1597361b82f 100644
--- a/src/mesa/pipe/softpipe/sp_tile_cache.c
+++ b/src/gallium/drivers/softpipe/sp_tile_cache.c
diff --git a/src/mesa/pipe/softpipe/sp_tile_cache.h b/src/gallium/drivers/softpipe/sp_tile_cache.h
index 7fd10812863..7fd10812863 100644
--- a/src/mesa/pipe/softpipe/sp_tile_cache.h
+++ b/src/gallium/drivers/softpipe/sp_tile_cache.h
diff --git a/src/mesa/pipe/softpipe/sp_winsys.h b/src/gallium/drivers/softpipe/sp_winsys.h
index d6b379f58c6..d6b379f58c6 100644
--- a/src/mesa/pipe/softpipe/sp_winsys.h
+++ b/src/gallium/drivers/softpipe/sp_winsys.h
diff --git a/src/mesa/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index 30cd729c564..30cd729c564 100644
--- a/src/mesa/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
diff --git a/src/mesa/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index 39f95695fb6..39f95695fb6 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
diff --git a/src/mesa/pipe/p_debug.h b/src/gallium/include/pipe/p_debug.h
index 2a11627b365..2a11627b365 100644
--- a/src/mesa/pipe/p_debug.h
+++ b/src/gallium/include/pipe/p_debug.h
diff --git a/src/mesa/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 0bf53ecb79d..0bf53ecb79d 100644
--- a/src/mesa/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
diff --git a/src/mesa/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
index c9ad3243158..c9ad3243158 100644
--- a/src/mesa/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
diff --git a/src/mesa/pipe/p_inlines.h b/src/gallium/include/pipe/p_inlines.h
index ebf6ed86bcc..ebf6ed86bcc 100644
--- a/src/mesa/pipe/p_inlines.h
+++ b/src/gallium/include/pipe/p_inlines.h
diff --git a/src/mesa/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h
index 3ce35310f6d..3ce35310f6d 100644
--- a/src/mesa/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
diff --git a/src/mesa/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 4d3a6b2f413..4d3a6b2f413 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
diff --git a/src/mesa/pipe/p_thread.h b/src/gallium/include/pipe/p_thread.h
index cd432c547ce..cd432c547ce 100644
--- a/src/mesa/pipe/p_thread.h
+++ b/src/gallium/include/pipe/p_thread.h
diff --git a/src/mesa/pipe/p_util.h b/src/gallium/include/pipe/p_util.h
index d7da2801c92..d7da2801c92 100644
--- a/src/mesa/pipe/p_util.h
+++ b/src/gallium/include/pipe/p_util.h
diff --git a/src/mesa/pipe/p_winsys.h b/src/gallium/include/pipe/p_winsys.h
index 1e81eebd782..1e81eebd782 100644
--- a/src/mesa/pipe/p_winsys.h
+++ b/src/gallium/include/pipe/p_winsys.h
diff --git a/src/mesa/drivers/dri/intel_winsys/Makefile b/src/gallium/winsys/dri/intel/Makefile
index 9ae0f013256..9ae0f013256 100644
--- a/src/mesa/drivers/dri/intel_winsys/Makefile
+++ b/src/gallium/winsys/dri/intel/Makefile
diff --git a/src/mesa/drivers/dri/intel_winsys/SConscript b/src/gallium/winsys/dri/intel/SConscript
index a7cc10450e3..a7cc10450e3 100644
--- a/src/mesa/drivers/dri/intel_winsys/SConscript
+++ b/src/gallium/winsys/dri/intel/SConscript
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.c b/src/gallium/winsys/dri/intel/intel_batchbuffer.c
index 49e04d81ec1..49e04d81ec1 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.c
+++ b/src/gallium/winsys/dri/intel/intel_batchbuffer.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.h b/src/gallium/winsys/dri/intel/intel_batchbuffer.h
index 82feafa21f6..82feafa21f6 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.h
+++ b/src/gallium/winsys/dri/intel/intel_batchbuffer.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_batchpool.c b/src/gallium/winsys/dri/intel/intel_batchpool.c
index 33b56817f6a..33b56817f6a 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_batchpool.c
+++ b/src/gallium/winsys/dri/intel/intel_batchpool.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_batchpool.h b/src/gallium/winsys/dri/intel/intel_batchpool.h
index f6a95723bcf..f6a95723bcf 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_batchpool.h
+++ b/src/gallium/winsys/dri/intel/intel_batchpool.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/gallium/winsys/dri/intel/intel_context.c
index c033f2a592c..c033f2a592c 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/gallium/winsys/dri/intel/intel_context.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/gallium/winsys/dri/intel/intel_context.h
index b01370c049c..b01370c049c 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/src/gallium/winsys/dri/intel/intel_context.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_lock.c b/src/gallium/winsys/dri/intel/intel_lock.c
index 70aa7ea5f46..70aa7ea5f46 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_lock.c
+++ b/src/gallium/winsys/dri/intel/intel_lock.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_reg.h b/src/gallium/winsys/dri/intel/intel_reg.h
index f37c24fda9a..f37c24fda9a 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_reg.h
+++ b/src/gallium/winsys/dri/intel/intel_reg.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.c b/src/gallium/winsys/dri/intel/intel_screen.c
index 9e31c013a95..9e31c013a95 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.c
+++ b/src/gallium/winsys/dri/intel/intel_screen.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.h b/src/gallium/winsys/dri/intel/intel_screen.h
index 3396f9e5643..3396f9e5643 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.h
+++ b/src/gallium/winsys/dri/intel/intel_screen.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c b/src/gallium/winsys/dri/intel/intel_swapbuffers.c
index 56b86d6a636..56b86d6a636 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
+++ b/src/gallium/winsys/dri/intel/intel_swapbuffers.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h b/src/gallium/winsys/dri/intel/intel_swapbuffers.h
index 7ae5fd15a5f..7ae5fd15a5f 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h
+++ b/src/gallium/winsys/dri/intel/intel_swapbuffers.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys.h b/src/gallium/winsys/dri/intel/intel_winsys.h
index ffc40782be7..ffc40782be7 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys.h
+++ b/src/gallium/winsys/dri/intel/intel_winsys.h
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c b/src/gallium/winsys/dri/intel/intel_winsys_i915.c
index 1ba6a9e1b25..1ba6a9e1b25 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c
+++ b/src/gallium/winsys/dri/intel/intel_winsys_i915.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c b/src/gallium/winsys/dri/intel/intel_winsys_pipe.c
index 789a386500a..789a386500a 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
+++ b/src/gallium/winsys/dri/intel/intel_winsys_pipe.c
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_softpipe.c b/src/gallium/winsys/dri/intel/intel_winsys_softpipe.c
index cec3437831c..cec3437831c 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_softpipe.c
+++ b/src/gallium/winsys/dri/intel/intel_winsys_softpipe.c
diff --git a/src/mesa/drivers/dri/intel_winsys/server/i830_common.h b/src/gallium/winsys/dri/intel/server/i830_common.h
index d4d58886ce0..d4d58886ce0 100644
--- a/src/mesa/drivers/dri/intel_winsys/server/i830_common.h
+++ b/src/gallium/winsys/dri/intel/server/i830_common.h
diff --git a/src/mesa/drivers/dri/intel_winsys/server/i830_dri.h b/src/gallium/winsys/dri/intel/server/i830_dri.h
index c2a3af8cbf7..c2a3af8cbf7 100644
--- a/src/mesa/drivers/dri/intel_winsys/server/i830_dri.h
+++ b/src/gallium/winsys/dri/intel/server/i830_dri.h
diff --git a/src/mesa/drivers/dri/intel_winsys/server/intel.h b/src/gallium/winsys/dri/intel/server/intel.h
index 6ea72499c1c..6ea72499c1c 100644
--- a/src/mesa/drivers/dri/intel_winsys/server/intel.h
+++ b/src/gallium/winsys/dri/intel/server/intel.h
diff --git a/src/mesa/drivers/dri/intel_winsys/server/intel_dri.c b/src/gallium/winsys/dri/intel/server/intel_dri.c
index e49c4214ad4..e49c4214ad4 100644
--- a/src/mesa/drivers/dri/intel_winsys/server/intel_dri.c
+++ b/src/gallium/winsys/dri/intel/server/intel_dri.c
diff --git a/src/mesa/pipe/xlib/brw_aub.c b/src/gallium/winsys/xlib/brw_aub.c
index 541d50c6e40..541d50c6e40 100644
--- a/src/mesa/pipe/xlib/brw_aub.c
+++ b/src/gallium/winsys/xlib/brw_aub.c
diff --git a/src/mesa/pipe/xlib/brw_aub.h b/src/gallium/winsys/xlib/brw_aub.h
index f5c60c7be28..f5c60c7be28 100644
--- a/src/mesa/pipe/xlib/brw_aub.h
+++ b/src/gallium/winsys/xlib/brw_aub.h
diff --git a/src/mesa/pipe/xlib/fakeglx.c b/src/gallium/winsys/xlib/fakeglx.c
index 902a7550754..902a7550754 100644
--- a/src/mesa/pipe/xlib/fakeglx.c
+++ b/src/gallium/winsys/xlib/fakeglx.c
diff --git a/src/mesa/pipe/xlib/glxapi.c b/src/gallium/winsys/xlib/glxapi.c
index c2ccce6f520..c2ccce6f520 100644
--- a/src/mesa/pipe/xlib/glxapi.c
+++ b/src/gallium/winsys/xlib/glxapi.c
diff --git a/src/mesa/pipe/xlib/glxapi.h b/src/gallium/winsys/xlib/glxapi.h
index 37de81e55ac..37de81e55ac 100644
--- a/src/mesa/pipe/xlib/glxapi.h
+++ b/src/gallium/winsys/xlib/glxapi.h
diff --git a/src/mesa/pipe/xlib/glxheader.h b/src/gallium/winsys/xlib/glxheader.h
index a402191f131..a402191f131 100644
--- a/src/mesa/pipe/xlib/glxheader.h
+++ b/src/gallium/winsys/xlib/glxheader.h
diff --git a/src/mesa/pipe/xlib/realglx.c b/src/gallium/winsys/xlib/realglx.c
index 30adb7465ba..30adb7465ba 100644
--- a/src/mesa/pipe/xlib/realglx.c
+++ b/src/gallium/winsys/xlib/realglx.c
diff --git a/src/mesa/pipe/xlib/realglx.h b/src/gallium/winsys/xlib/realglx.h
index 150129db681..150129db681 100644
--- a/src/mesa/pipe/xlib/realglx.h
+++ b/src/gallium/winsys/xlib/realglx.h
diff --git a/src/mesa/pipe/xlib/xfonts.c b/src/gallium/winsys/xlib/xfonts.c
index d72c600bd1b..d72c600bd1b 100644
--- a/src/mesa/pipe/xlib/xfonts.c
+++ b/src/gallium/winsys/xlib/xfonts.c
diff --git a/src/mesa/pipe/xlib/xfonts.h b/src/gallium/winsys/xlib/xfonts.h
index e36f42f817a..e36f42f817a 100644
--- a/src/mesa/pipe/xlib/xfonts.h
+++ b/src/gallium/winsys/xlib/xfonts.h
diff --git a/src/mesa/pipe/xlib/xm_api.c b/src/gallium/winsys/xlib/xm_api.c
index e5fef1d7a81..e5fef1d7a81 100644
--- a/src/mesa/pipe/xlib/xm_api.c
+++ b/src/gallium/winsys/xlib/xm_api.c
diff --git a/src/mesa/pipe/xlib/xm_image.c b/src/gallium/winsys/xlib/xm_image.c
index 087b4e4c3a7..087b4e4c3a7 100644
--- a/src/mesa/pipe/xlib/xm_image.c
+++ b/src/gallium/winsys/xlib/xm_image.c
diff --git a/src/mesa/pipe/xlib/xm_image.h b/src/gallium/winsys/xlib/xm_image.h
index 2a5e0f37779..2a5e0f37779 100644
--- a/src/mesa/pipe/xlib/xm_image.h
+++ b/src/gallium/winsys/xlib/xm_image.h
diff --git a/src/mesa/pipe/xlib/xm_winsys.c b/src/gallium/winsys/xlib/xm_winsys.c
index c3cd22eea3f..c3cd22eea3f 100644
--- a/src/mesa/pipe/xlib/xm_winsys.c
+++ b/src/gallium/winsys/xlib/xm_winsys.c
diff --git a/src/mesa/pipe/xlib/xm_winsys_aub.c b/src/gallium/winsys/xlib/xm_winsys_aub.c
index bf415702570..bf415702570 100644
--- a/src/mesa/pipe/xlib/xm_winsys_aub.c
+++ b/src/gallium/winsys/xlib/xm_winsys_aub.c
diff --git a/src/mesa/pipe/xlib/xm_winsys_aub.h b/src/gallium/winsys/xlib/xm_winsys_aub.h
index 7bee1991169..7bee1991169 100644
--- a/src/mesa/pipe/xlib/xm_winsys_aub.h
+++ b/src/gallium/winsys/xlib/xm_winsys_aub.h
diff --git a/src/mesa/pipe/xlib/xmesaP.h b/src/gallium/winsys/xlib/xmesaP.h
index fa8d1f14b95..fa8d1f14b95 100644
--- a/src/mesa/pipe/xlib/xmesaP.h
+++ b/src/gallium/winsys/xlib/xmesaP.h