Merge commit 'origin/gallium-0.1' into gallium-0.1

88 files changed, 40 insertions, 40 deletions

diff --git a/src/gallium/Makefile b/src/gallium/Makefile
index a13b9a52d36..89e068a4492 100644
--- a/src/gallium/Makefile
+++ b/src/gallium/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/configs/current
 
 
-SUBDIRS = aux drivers
+SUBDIRS = auxiliary drivers
 
 
 default: subdirs
diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
index 0717ed8dd24..83b25f9b47c 100644
--- a/src/gallium/Makefile.template
+++ b/src/gallium/Makefile.template
@@ -17,7 +17,7 @@ INCLUDES = \
 	-I. \
 	-I$(TOP)/src/gallium/include \
 	-I$(TOP)/src/gallium/include/pipe \
-	-I$(TOP)/src/gallium/aux \
+	-I$(TOP)/src/gallium/auxiliary \
 	-I$(TOP)/src/gallium/drivers \
 	-I$(TOP)/src/mesa \
 	-I$(TOP)/include \
diff --git a/src/gallium/aux/Makefile b/src/gallium/auxiliary/Makefile
index da68498aa1f..da68498aa1f 100644
--- a/src/gallium/aux/Makefile
+++ b/src/gallium/auxiliary/Makefile
diff --git a/src/gallium/aux/cso_cache/cso_cache.c b/src/gallium/auxiliary/cso_cache/cso_cache.c
index 9e77e0774dd..9e77e0774dd 100644
--- a/src/gallium/aux/cso_cache/cso_cache.c
+++ b/src/gallium/auxiliary/cso_cache/cso_cache.c
diff --git a/src/gallium/aux/cso_cache/cso_cache.h b/src/gallium/auxiliary/cso_cache/cso_cache.h
index 116e2eaa2c8..116e2eaa2c8 100644
--- a/src/gallium/aux/cso_cache/cso_cache.h
+++ b/src/gallium/auxiliary/cso_cache/cso_cache.h
diff --git a/src/gallium/aux/cso_cache/cso_hash.c b/src/gallium/auxiliary/cso_cache/cso_hash.c
index 0338cb3b474..0338cb3b474 100644
--- a/src/gallium/aux/cso_cache/cso_hash.c
+++ b/src/gallium/auxiliary/cso_cache/cso_hash.c
diff --git a/src/gallium/aux/cso_cache/cso_hash.h b/src/gallium/auxiliary/cso_cache/cso_hash.h
index b4aa111860f..b4aa111860f 100644
--- a/src/gallium/aux/cso_cache/cso_hash.h
+++ b/src/gallium/auxiliary/cso_cache/cso_hash.h
diff --git a/src/gallium/aux/draw/Makefile b/src/gallium/auxiliary/draw/Makefile
index 451911a3545..451911a3545 100644
--- a/src/gallium/aux/draw/Makefile
+++ b/src/gallium/auxiliary/draw/Makefile
diff --git a/src/gallium/aux/draw/draw_clip.c b/src/gallium/auxiliary/draw/draw_clip.c
index e3051507eaf..e3051507eaf 100644
--- a/src/gallium/aux/draw/draw_clip.c
+++ b/src/gallium/auxiliary/draw/draw_clip.c
diff --git a/src/gallium/aux/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c
index 4be38303169..4be38303169 100644
--- a/src/gallium/aux/draw/draw_context.c
+++ b/src/gallium/auxiliary/draw/draw_context.c
diff --git a/src/gallium/aux/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h
index ddeb184497a..ddeb184497a 100644
--- a/src/gallium/aux/draw/draw_context.h
+++ b/src/gallium/auxiliary/draw/draw_context.h
diff --git a/src/gallium/aux/draw/draw_cull.c b/src/gallium/auxiliary/draw/draw_cull.c
index 8177b0ac86e..8177b0ac86e 100644
--- a/src/gallium/aux/draw/draw_cull.c
+++ b/src/gallium/auxiliary/draw/draw_cull.c
diff --git a/src/gallium/aux/draw/draw_debug.c b/src/gallium/auxiliary/draw/draw_debug.c
index d6220b5f62c..d6220b5f62c 100644
--- a/src/gallium/aux/draw/draw_debug.c
+++ b/src/gallium/auxiliary/draw/draw_debug.c
diff --git a/src/gallium/aux/draw/draw_flatshade.c b/src/gallium/auxiliary/draw/draw_flatshade.c
index 4398abbc60c..4398abbc60c 100644
--- a/src/gallium/aux/draw/draw_flatshade.c
+++ b/src/gallium/auxiliary/draw/draw_flatshade.c
diff --git a/src/gallium/aux/draw/draw_offset.c b/src/gallium/auxiliary/draw/draw_offset.c
index dbc676deae4..dbc676deae4 100644
--- a/src/gallium/aux/draw/draw_offset.c
+++ b/src/gallium/auxiliary/draw/draw_offset.c
diff --git a/src/gallium/aux/draw/draw_prim.c b/src/gallium/auxiliary/draw/draw_prim.c
index 51e2242719a..51e2242719a 100644
--- a/src/gallium/aux/draw/draw_prim.c
+++ b/src/gallium/auxiliary/draw/draw_prim.c
diff --git a/src/gallium/aux/draw/draw_private.h b/src/gallium/auxiliary/draw/draw_private.h
index 3d09aef87c1..3d09aef87c1 100644
--- a/src/gallium/aux/draw/draw_private.h
+++ b/src/gallium/auxiliary/draw/draw_private.h
diff --git a/src/gallium/aux/draw/draw_stipple.c b/src/gallium/auxiliary/draw/draw_stipple.c
index 506f33512c8..506f33512c8 100644
--- a/src/gallium/aux/draw/draw_stipple.c
+++ b/src/gallium/auxiliary/draw/draw_stipple.c
diff --git a/src/gallium/aux/draw/draw_twoside.c b/src/gallium/auxiliary/draw/draw_twoside.c
index 1c389579871..1c389579871 100644
--- a/src/gallium/aux/draw/draw_twoside.c
+++ b/src/gallium/auxiliary/draw/draw_twoside.c
diff --git a/src/gallium/aux/draw/draw_unfilled.c b/src/gallium/auxiliary/draw/draw_unfilled.c
index 8777cfdfc86..8777cfdfc86 100644
--- a/src/gallium/aux/draw/draw_unfilled.c
+++ b/src/gallium/auxiliary/draw/draw_unfilled.c
diff --git a/src/gallium/aux/draw/draw_validate.c b/src/gallium/auxiliary/draw/draw_validate.c
index 4375ebabbc4..4375ebabbc4 100644
--- a/src/gallium/aux/draw/draw_validate.c
+++ b/src/gallium/auxiliary/draw/draw_validate.c
diff --git a/src/gallium/aux/draw/draw_vbuf.c b/src/gallium/auxiliary/draw/draw_vbuf.c
index 71ac73912b8..71ac73912b8 100644
--- a/src/gallium/aux/draw/draw_vbuf.c
+++ b/src/gallium/auxiliary/draw/draw_vbuf.c
diff --git a/src/gallium/aux/draw/draw_vbuf.h b/src/gallium/auxiliary/draw/draw_vbuf.h
index cfd2b9820c1..cfd2b9820c1 100644
--- a/src/gallium/aux/draw/draw_vbuf.h
+++ b/src/gallium/auxiliary/draw/draw_vbuf.h
diff --git a/src/gallium/aux/draw/draw_vertex.c b/src/gallium/auxiliary/draw/draw_vertex.c
index daf1ef4b80f..daf1ef4b80f 100644
--- a/src/gallium/aux/draw/draw_vertex.c
+++ b/src/gallium/auxiliary/draw/draw_vertex.c
diff --git a/src/gallium/aux/draw/draw_vertex.h b/src/gallium/auxiliary/draw/draw_vertex.h
index 267c74203bd..267c74203bd 100644
--- a/src/gallium/aux/draw/draw_vertex.h
+++ b/src/gallium/auxiliary/draw/draw_vertex.h
diff --git a/src/gallium/aux/draw/draw_vertex_cache.c b/src/gallium/auxiliary/draw/draw_vertex_cache.c
index 44427999ccf..44427999ccf 100644
--- a/src/gallium/aux/draw/draw_vertex_cache.c
+++ b/src/gallium/auxiliary/draw/draw_vertex_cache.c
diff --git a/src/gallium/aux/draw/draw_vertex_fetch.c b/src/gallium/auxiliary/draw/draw_vertex_fetch.c
index e13df04605c..e13df04605c 100644
--- a/src/gallium/aux/draw/draw_vertex_fetch.c
+++ b/src/gallium/auxiliary/draw/draw_vertex_fetch.c
diff --git a/src/gallium/aux/draw/draw_vertex_shader.c b/src/gallium/auxiliary/draw/draw_vertex_shader.c
index 9413f8b43a4..9413f8b43a4 100644
--- a/src/gallium/aux/draw/draw_vertex_shader.c
+++ b/src/gallium/auxiliary/draw/draw_vertex_shader.c
diff --git a/src/gallium/aux/draw/draw_vf.c b/src/gallium/auxiliary/draw/draw_vf.c
index dc3a5ecd219..dc3a5ecd219 100644
--- a/src/gallium/aux/draw/draw_vf.c
+++ b/src/gallium/auxiliary/draw/draw_vf.c
diff --git a/src/gallium/aux/draw/draw_vf.h b/src/gallium/auxiliary/draw/draw_vf.h
index 011c8f0ff1c..011c8f0ff1c 100644
--- a/src/gallium/aux/draw/draw_vf.h
+++ b/src/gallium/auxiliary/draw/draw_vf.h
diff --git a/src/gallium/aux/draw/draw_vf_generic.c b/src/gallium/auxiliary/draw/draw_vf_generic.c
index 7a60a9db9c3..7a60a9db9c3 100644
--- a/src/gallium/aux/draw/draw_vf_generic.c
+++ b/src/gallium/auxiliary/draw/draw_vf_generic.c
diff --git a/src/gallium/aux/draw/draw_vf_sse.c b/src/gallium/auxiliary/draw/draw_vf_sse.c
index 1ad2ae756dd..1ad2ae756dd 100644
--- a/src/gallium/aux/draw/draw_vf_sse.c
+++ b/src/gallium/auxiliary/draw/draw_vf_sse.c
diff --git a/src/gallium/aux/draw/draw_wide_prims.c b/src/gallium/auxiliary/draw/draw_wide_prims.c
index 655774b155f..655774b155f 100644
--- a/src/gallium/aux/draw/draw_wide_prims.c
+++ b/src/gallium/auxiliary/draw/draw_wide_prims.c
diff --git a/src/gallium/aux/llvm/Makefile b/src/gallium/auxiliary/llvm/Makefile
index e6ac399d088..e0abf860c17 100644
--- a/src/gallium/aux/llvm/Makefile
+++ b/src/gallium/auxiliary/llvm/Makefile
@@ -31,7 +31,7 @@ OBJECTS = $(C_SOURCES:.c=.o) \
 INCLUDES = \
 	-I. \
 	-I$(TOP)/src/gallium/drivers
-	-I$(TOP)/src/gallium/aux \
+	-I$(TOP)/src/gallium/auxiliary \
 	-I$(TOP)/src/gallium/include \
 	-I$(TOP)/src/mesa \
 	-I$(TOP)/include
diff --git a/src/gallium/aux/llvm/gallivm.cpp b/src/gallium/auxiliary/llvm/gallivm.cpp
index d14bb3b99a8..d14bb3b99a8 100644
--- a/src/gallium/aux/llvm/gallivm.cpp
+++ b/src/gallium/auxiliary/llvm/gallivm.cpp
diff --git a/src/gallium/aux/llvm/gallivm.h b/src/gallium/auxiliary/llvm/gallivm.h
index 92da4bca7f4..92da4bca7f4 100644
--- a/src/gallium/aux/llvm/gallivm.h
+++ b/src/gallium/auxiliary/llvm/gallivm.h
diff --git a/src/gallium/aux/llvm/gallivm_builtins.cpp b/src/gallium/auxiliary/llvm/gallivm_builtins.cpp
index 1796f0a1772..1796f0a1772 100644
--- a/src/gallium/aux/llvm/gallivm_builtins.cpp
+++ b/src/gallium/auxiliary/llvm/gallivm_builtins.cpp
diff --git a/src/gallium/aux/llvm/gallivm_cpu.cpp b/src/gallium/auxiliary/llvm/gallivm_cpu.cpp
index 8f9830d0b1e..8f9830d0b1e 100644
--- a/src/gallium/aux/llvm/gallivm_cpu.cpp
+++ b/src/gallium/auxiliary/llvm/gallivm_cpu.cpp
diff --git a/src/gallium/aux/llvm/gallivm_p.h b/src/gallium/auxiliary/llvm/gallivm_p.h
index cfe7b1901b3..cfe7b1901b3 100644
--- a/src/gallium/aux/llvm/gallivm_p.h
+++ b/src/gallium/auxiliary/llvm/gallivm_p.h
diff --git a/src/gallium/aux/llvm/instructions.cpp b/src/gallium/auxiliary/llvm/instructions.cpp
index 55d39fa5f12..55d39fa5f12 100644
--- a/src/gallium/aux/llvm/instructions.cpp
+++ b/src/gallium/auxiliary/llvm/instructions.cpp
diff --git a/src/gallium/aux/llvm/instructions.h b/src/gallium/auxiliary/llvm/instructions.h
index 9ebc17dd8ec..9ebc17dd8ec 100644
--- a/src/gallium/aux/llvm/instructions.h
+++ b/src/gallium/auxiliary/llvm/instructions.h
diff --git a/src/gallium/aux/llvm/instructionssoa.cpp b/src/gallium/auxiliary/llvm/instructionssoa.cpp
index a4d50466373..a4d50466373 100644
--- a/src/gallium/aux/llvm/instructionssoa.cpp
+++ b/src/gallium/auxiliary/llvm/instructionssoa.cpp
diff --git a/src/gallium/aux/llvm/instructionssoa.h b/src/gallium/auxiliary/llvm/instructionssoa.h
index 4169dcbb2eb..4169dcbb2eb 100644
--- a/src/gallium/aux/llvm/instructionssoa.h
+++ b/src/gallium/auxiliary/llvm/instructionssoa.h
diff --git a/src/gallium/aux/llvm/llvm_builtins.c b/src/gallium/auxiliary/llvm/llvm_builtins.c
index 4f98d754baa..4f98d754baa 100644
--- a/src/gallium/aux/llvm/llvm_builtins.c
+++ b/src/gallium/auxiliary/llvm/llvm_builtins.c
diff --git a/src/gallium/aux/llvm/loweringpass.cpp b/src/gallium/auxiliary/llvm/loweringpass.cpp
index 556dbec3661..556dbec3661 100644
--- a/src/gallium/aux/llvm/loweringpass.cpp
+++ b/src/gallium/auxiliary/llvm/loweringpass.cpp
diff --git a/src/gallium/aux/llvm/loweringpass.h b/src/gallium/auxiliary/llvm/loweringpass.h
index f62dcf6ba73..f62dcf6ba73 100644
--- a/src/gallium/aux/llvm/loweringpass.h
+++ b/src/gallium/auxiliary/llvm/loweringpass.h
diff --git a/src/gallium/aux/llvm/storage.cpp b/src/gallium/auxiliary/llvm/storage.cpp
index c4326de8c53..c4326de8c53 100644
--- a/src/gallium/aux/llvm/storage.cpp
+++ b/src/gallium/auxiliary/llvm/storage.cpp
diff --git a/src/gallium/aux/llvm/storage.h b/src/gallium/auxiliary/llvm/storage.h
index 8574f7554e3..8574f7554e3 100644
--- a/src/gallium/aux/llvm/storage.h
+++ b/src/gallium/auxiliary/llvm/storage.h
diff --git a/src/gallium/aux/llvm/storagesoa.cpp b/src/gallium/auxiliary/llvm/storagesoa.cpp
index ed0674a96f0..ed0674a96f0 100644
--- a/src/gallium/aux/llvm/storagesoa.cpp
+++ b/src/gallium/auxiliary/llvm/storagesoa.cpp
diff --git a/src/gallium/aux/llvm/storagesoa.h b/src/gallium/auxiliary/llvm/storagesoa.h
index 6443351f270..6443351f270 100644
--- a/src/gallium/aux/llvm/storagesoa.h
+++ b/src/gallium/auxiliary/llvm/storagesoa.h
diff --git a/src/gallium/aux/llvm/tgsitollvm.cpp b/src/gallium/auxiliary/llvm/tgsitollvm.cpp
index 2cb4acce32f..2cb4acce32f 100644
--- a/src/gallium/aux/llvm/tgsitollvm.cpp
+++ b/src/gallium/auxiliary/llvm/tgsitollvm.cpp
diff --git a/src/gallium/aux/llvm/tgsitollvm.h b/src/gallium/auxiliary/llvm/tgsitollvm.h
index 7ada04d6299..7ada04d6299 100644
--- a/src/gallium/aux/llvm/tgsitollvm.h
+++ b/src/gallium/auxiliary/llvm/tgsitollvm.h
diff --git a/src/gallium/aux/pipebuffer/Makefile b/src/gallium/auxiliary/pipebuffer/Makefile
index 588629e8701..588629e8701 100644
--- a/src/gallium/aux/pipebuffer/Makefile
+++ b/src/gallium/auxiliary/pipebuffer/Makefile
diff --git a/src/gallium/aux/pipebuffer/linked_list.h b/src/gallium/auxiliary/pipebuffer/linked_list.h
index e99817fb130..e99817fb130 100644
--- a/src/gallium/aux/pipebuffer/linked_list.h
+++ b/src/gallium/auxiliary/pipebuffer/linked_list.h
diff --git a/src/gallium/aux/pipebuffer/pb_buffer.h b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
index 97beb5f72a9..97beb5f72a9 100644
--- a/src/gallium/aux/pipebuffer/pb_buffer.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
diff --git a/src/gallium/aux/pipebuffer/pb_buffer_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index f4fc3f6d714..f4fc3f6d714 100644
--- a/src/gallium/aux/pipebuffer/pb_buffer_fenced.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
diff --git a/src/gallium/aux/pipebuffer/pb_buffer_fenced.h b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.h
index c40b9c75e18..c40b9c75e18 100644
--- a/src/gallium/aux/pipebuffer/pb_buffer_fenced.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.h
diff --git a/src/gallium/aux/pipebuffer/pb_buffer_malloc.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c
index 9e8244f909b..9e8244f909b 100644
--- a/src/gallium/aux/pipebuffer/pb_buffer_malloc.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c
diff --git a/src/gallium/aux/pipebuffer/pb_bufmgr.h b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h
index 1ddf784c978..1ddf784c978 100644
--- a/src/gallium/aux/pipebuffer/pb_bufmgr.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h
diff --git a/src/gallium/aux/pipebuffer/pb_bufmgr_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c
index c535d3276c9..c535d3276c9 100644
--- a/src/gallium/aux/pipebuffer/pb_bufmgr_fenced.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c
diff --git a/src/gallium/aux/pipebuffer/pb_bufmgr_mm.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
index 8b1b51c0e28..8b1b51c0e28 100644
--- a/src/gallium/aux/pipebuffer/pb_bufmgr_mm.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
diff --git a/src/gallium/aux/pipebuffer/pb_bufmgr_pool.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c
index 04477a865a5..04477a865a5 100644
--- a/src/gallium/aux/pipebuffer/pb_bufmgr_pool.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c
diff --git a/src/gallium/aux/pipebuffer/pb_winsys.c b/src/gallium/auxiliary/pipebuffer/pb_winsys.c
index 978944091fd..978944091fd 100644
--- a/src/gallium/aux/pipebuffer/pb_winsys.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_winsys.c
diff --git a/src/gallium/aux/tgsi/Makefile b/src/gallium/auxiliary/tgsi/Makefile
index 12a8bd0409e..12a8bd0409e 100644
--- a/src/gallium/aux/tgsi/Makefile
+++ b/src/gallium/auxiliary/tgsi/Makefile
diff --git a/src/gallium/aux/tgsi/exec/Makefile b/src/gallium/auxiliary/tgsi/exec/Makefile
index eb8b14e0e89..eb8b14e0e89 100644
--- a/src/gallium/aux/tgsi/exec/Makefile
+++ b/src/gallium/auxiliary/tgsi/exec/Makefile
diff --git a/src/gallium/aux/tgsi/exec/tgsi_exec.c b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
index d7b18dc9c59..d7b18dc9c59 100644
--- a/src/gallium/aux/tgsi/exec/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
diff --git a/src/gallium/aux/tgsi/exec/tgsi_exec.h b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.h
index 45c49dd007c..45c49dd007c 100644
--- a/src/gallium/aux/tgsi/exec/tgsi_exec.h
+++ b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.h
diff --git a/src/gallium/aux/tgsi/exec/tgsi_sse2.c b/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
index 79209575bc4..79209575bc4 100755
--- a/src/gallium/aux/tgsi/exec/tgsi_sse2.c
+++ b/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
diff --git a/src/gallium/aux/tgsi/exec/tgsi_sse2.h b/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.h
index 9bee3717665..9bee3717665 100755
--- a/src/gallium/aux/tgsi/exec/tgsi_sse2.h
+++ b/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.h
diff --git a/src/gallium/aux/tgsi/util/tgsi_build.c b/src/gallium/auxiliary/tgsi/util/tgsi_build.c
index a00ff1c2a5f..a00ff1c2a5f 100644
--- a/src/gallium/aux/tgsi/util/tgsi_build.c
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_build.c
diff --git a/src/gallium/aux/tgsi/util/tgsi_build.h b/src/gallium/auxiliary/tgsi/util/tgsi_build.h
index 116c78abf34..116c78abf34 100644
--- a/src/gallium/aux/tgsi/util/tgsi_build.h
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_build.h
diff --git a/src/gallium/aux/tgsi/util/tgsi_dump.c b/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
index b5c54847e0b..b5c54847e0b 100644
--- a/src/gallium/aux/tgsi/util/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
diff --git a/src/gallium/aux/tgsi/util/tgsi_dump.h b/src/gallium/auxiliary/tgsi/util/tgsi_dump.h
index 1adc9db2519..1adc9db2519 100644
--- a/src/gallium/aux/tgsi/util/tgsi_dump.h
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_dump.h
diff --git a/src/gallium/aux/tgsi/util/tgsi_parse.c b/src/gallium/auxiliary/tgsi/util/tgsi_parse.c
index bf6b89ce564..bf6b89ce564 100644
--- a/src/gallium/aux/tgsi/util/tgsi_parse.c
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_parse.c
diff --git a/src/gallium/aux/tgsi/util/tgsi_parse.h b/src/gallium/auxiliary/tgsi/util/tgsi_parse.h
index 9372da8d5d1..9372da8d5d1 100644
--- a/src/gallium/aux/tgsi/util/tgsi_parse.h
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_parse.h
diff --git a/src/gallium/aux/tgsi/util/tgsi_transform.c b/src/gallium/auxiliary/tgsi/util/tgsi_transform.c
index 357f77b05a6..357f77b05a6 100644
--- a/src/gallium/aux/tgsi/util/tgsi_transform.c
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_transform.c
diff --git a/src/gallium/aux/tgsi/util/tgsi_transform.h b/src/gallium/auxiliary/tgsi/util/tgsi_transform.h
index fcf85d603be..fcf85d603be 100644
--- a/src/gallium/aux/tgsi/util/tgsi_transform.h
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_transform.h
diff --git a/src/gallium/aux/tgsi/util/tgsi_util.c b/src/gallium/auxiliary/tgsi/util/tgsi_util.c
index 4cdd89182ad..4cdd89182ad 100644
--- a/src/gallium/aux/tgsi/util/tgsi_util.c
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_util.c
diff --git a/src/gallium/aux/tgsi/util/tgsi_util.h b/src/gallium/auxiliary/tgsi/util/tgsi_util.h
index ef14446f0e4..ef14446f0e4 100644
--- a/src/gallium/aux/tgsi/util/tgsi_util.h
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_util.h
diff --git a/src/gallium/aux/util/p_debug.c b/src/gallium/auxiliary/util/p_debug.c
index b9607a6ba7f..b9607a6ba7f 100644
--- a/src/gallium/aux/util/p_debug.c
+++ b/src/gallium/auxiliary/util/p_debug.c
diff --git a/src/gallium/aux/util/p_tile.c b/src/gallium/auxiliary/util/p_tile.c
index 3f795a38989..3f795a38989 100644
--- a/src/gallium/aux/util/p_tile.c
+++ b/src/gallium/auxiliary/util/p_tile.c
diff --git a/src/gallium/aux/util/p_tile.h b/src/gallium/auxiliary/util/p_tile.h
index cd8124bf11f..cd8124bf11f 100644
--- a/src/gallium/aux/util/p_tile.h
+++ b/src/gallium/auxiliary/util/p_tile.h
diff --git a/src/gallium/aux/util/p_util.c b/src/gallium/auxiliary/util/p_util.c
index 2a92f8e408b..2a92f8e408b 100644
--- a/src/gallium/aux/util/p_util.c
+++ b/src/gallium/auxiliary/util/p_util.c
diff --git a/src/gallium/drivers/cell/ppu/Makefile b/src/gallium/drivers/cell/ppu/Makefile
index 011863c11e1..a4c3f29e8a4 100644
--- a/src/gallium/drivers/cell/ppu/Makefile
+++ b/src/gallium/drivers/cell/ppu/Makefile
@@ -43,7 +43,7 @@ OBJECTS = $(SOURCES:.c=.o) \
 INCLUDE_DIRS = \
 	-I$(TOP)/src/mesa \
 	-I$(TOP)/src/gallium/include \
-	-I$(TOP)/src/gallium/aux \
+	-I$(TOP)/src/gallium/auxiliary \
 	-I$(TOP)/src/gallium/drivers
 
 .c.o:
diff --git a/src/gallium/drivers/cell/spu/Makefile b/src/gallium/drivers/cell/spu/Makefile
index 7aa947299e7..30ef2450ece 100644
--- a/src/gallium/drivers/cell/spu/Makefile
+++ b/src/gallium/drivers/cell/spu/Makefile
@@ -34,7 +34,7 @@ SPU_ASM_OUT = $(SOURCES:.c=.s) \
 INCLUDE_DIRS = \
 	-I$(TOP)/src/mesa \
 	-I$(TOP)/src/gallium/include \
-	-I$(TOP)/src/gallium/aux \
+	-I$(TOP)/src/gallium/auxiliary \
 	-I$(TOP)/src/gallium/drivers
 
 
diff --git a/src/gallium/winsys/dri/Makefile.template b/src/gallium/winsys/dri/Makefile.template
index b96305c0940..2a261ed6694 100644
--- a/src/gallium/winsys/dri/Makefile.template
+++ b/src/gallium/winsys/dri/Makefile.template
@@ -49,7 +49,7 @@ SHARED_INCLUDES = \
 	-I$(TOP)/include \
 	-I$(TOP)/include/GL/internal \
 	-I$(TOP)/src/gallium/include \
-	-I$(TOP)/src/gallium/aux \
+	-I$(TOP)/src/gallium/auxiliary \
 	-I$(TOP)/src/gallium/drivers \
 	-I$(TOP)/src/mesa \
 	-I$(TOP)/src/mesa/main \
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 561608fedd6..c8cb2b592fe 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -21,7 +21,7 @@ CELL_LIB_SPU = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a
 endif
 
 ifeq ($(CONFIG_NAME), linux-llvm)
-LLVM_LIB = $(TOP)/src/gallium/aux/llvm/libgallivm.a
+LLVM_LIB = $(TOP)/src/gallium/auxiliary/llvm/libgallivm.a
 endif
 
 .SUFFIXES : .cpp
diff --git a/src/mesa/sources b/src/mesa/sources
index 2d07738210d..cecd8a830fe 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -158,45 +158,45 @@ VF_SOURCES = \
 
 
 DRAW_SOURCES = \
-	$(TOP)/src/gallium/aux/draw/draw_clip.c \
-	$(TOP)/src/gallium/aux/draw/draw_context.c\
-	$(TOP)/src/gallium/aux/draw/draw_cull.c \
-	$(TOP)/src/gallium/aux/draw/draw_debug.c \
-	$(TOP)/src/gallium/aux/draw/draw_flatshade.c \
-	$(TOP)/src/gallium/aux/draw/draw_offset.c \
-	$(TOP)/src/gallium/aux/draw/draw_prim.c \
-	$(TOP)/src/gallium/aux/draw/draw_stipple.c \
-	$(TOP)/src/gallium/aux/draw/draw_twoside.c \
-	$(TOP)/src/gallium/aux/draw/draw_unfilled.c \
-	$(TOP)/src/gallium/aux/draw/draw_validate.c \
-	$(TOP)/src/gallium/aux/draw/draw_vbuf.c \
-	$(TOP)/src/gallium/aux/draw/draw_vertex.c \
-	$(TOP)/src/gallium/aux/draw/draw_vertex_cache.c \
-	$(TOP)/src/gallium/aux/draw/draw_vertex_fetch.c \
-	$(TOP)/src/gallium/aux/draw/draw_vertex_shader.c \
-	$(TOP)/src/gallium/aux/draw/draw_vf.c \
-	$(TOP)/src/gallium/aux/draw/draw_vf_generic.c \
-	$(TOP)/src/gallium/aux/draw/draw_vf_sse.c \
-	$(TOP)/src/gallium/aux/draw/draw_wide_prims.c
+	$(TOP)/src/gallium/auxiliary/draw/draw_clip.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_context.c\
+	$(TOP)/src/gallium/auxiliary/draw/draw_cull.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_debug.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_flatshade.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_offset.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_prim.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_stipple.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_twoside.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_unfilled.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_validate.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_vbuf.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_vertex.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_vertex_cache.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_vertex_fetch.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_vertex_shader.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_vf.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_vf_generic.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_vf_sse.c \
+	$(TOP)/src/gallium/auxiliary/draw/draw_wide_prims.c
 
 TGSIEXEC_SOURCES = \
-	$(TOP)/src/gallium/aux/tgsi/exec/tgsi_exec.c \
-	$(TOP)/src/gallium/aux/tgsi/exec/tgsi_sse2.c
+	$(TOP)/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c \
+	$(TOP)/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
 
 TGSIUTIL_SOURCES = \
-	$(TOP)/src/gallium/aux/tgsi/util/tgsi_build.c \
-	$(TOP)/src/gallium/aux/tgsi/util/tgsi_dump.c \
-	$(TOP)/src/gallium/aux/tgsi/util/tgsi_parse.c \
-	$(TOP)/src/gallium/aux/tgsi/util/tgsi_util.c
+	$(TOP)/src/gallium/auxiliary/tgsi/util/tgsi_build.c \
+	$(TOP)/src/gallium/auxiliary/tgsi/util/tgsi_dump.c \
+	$(TOP)/src/gallium/auxiliary/tgsi/util/tgsi_parse.c \
+	$(TOP)/src/gallium/auxiliary/tgsi/util/tgsi_util.c
 
 STATECACHE_SOURCES = \
-	$(TOP)/src/gallium/aux/cso_cache/cso_hash.c \
-	$(TOP)/src/gallium/aux/cso_cache/cso_cache.c
+	$(TOP)/src/gallium/auxiliary/cso_cache/cso_hash.c \
+	$(TOP)/src/gallium/auxiliary/cso_cache/cso_cache.c
 
 PIPEUTIL_SOURCES = \
-	$(TOP)/src/gallium/aux/util/p_debug.c \
-	$(TOP)/src/gallium/aux/util/p_tile.c \
-	$(TOP)/src/gallium/aux/util/p_util.c
+	$(TOP)/src/gallium/auxiliary/util/p_debug.c \
+	$(TOP)/src/gallium/auxiliary/util/p_tile.c \
+	$(TOP)/src/gallium/auxiliary/util/p_util.c
 
 STATETRACKER_SOURCES = \
 	state_tracker/st_atom.c \
@@ -428,7 +428,7 @@ INCLUDE_DIRS = \
 	-I$(TOP)/src/mesa/main \
 	-I$(TOP)/src/gallium/include \
 	-I$(TOP)/src/gallium/drivers \
-	-I$(TOP)/src/gallium/aux
+	-I$(TOP)/src/gallium/auxiliary
 
 OLD_INCLUDE_DIRS = \
 	-I$(TOP)/src/mesa/tnl \
@@ -438,4 +438,4 @@ OLD_INCLUDE_DIRS = \
 	-I$(TOP)/src/mesa/shader \
 	-I$(TOP)/src/mesa/shader/grammar \
 	-I$(TOP)/src/mesa/shader/slang \
-	-I$(TOP)/s$(TOP)/src/gallium/aux/tgsi
+	-I$(TOP)/s$(TOP)/src/gallium/auxiliary/tgsi