From d73ac5ab285a4cf4c7568c27952e8a9e8ff155d3 Mon Sep 17 00:00:00 2001
From: David Reveman <davidr@novell.com>
Date: Mon, 5 Mar 2007 10:14:03 +0100
Subject: [PATCH] Sync with mesa.

---
 GL/mesa/Makefile.am             |  4 +--
 GL/mesa/array_cache/Makefile.am |  2 +-
 GL/mesa/tnl/Makefile.am         | 14 +++-------
 GL/symlink-mesa.sh              | 48 ++++++++++++++++++---------------
 4 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am
index 18eebfc92..4f225da95 100644
--- a/GL/mesa/Makefile.am
+++ b/GL/mesa/Makefile.am
@@ -1,11 +1,11 @@
-SUBDIRS = main math array_cache swrast swrast_setup tnl shader X glapi
+SUBDIRS = main math vbo swrast swrast_setup tnl shader X glapi
 
 noinst_LTLIBRARIES = libGLcore.la
 
 libGLcore_la_SOURCES = dummy.c
 libGLcore_la_LIBADD = main/libmain.la \
                       math/libmath.la \
-                      array_cache/libac.la \
+                      vbo/libvbo.la \
                       swrast/libswrast.la \
                       swrast_setup/libss.la \
                       tnl/libtnl.la \
diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am
index 4ff6da199..0374b7c66 100644
--- a/GL/mesa/array_cache/Makefile.am
+++ b/GL/mesa/array_cache/Makefile.am
@@ -15,4 +15,4 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I.. \
            -I$(top_srcdir)/hw/xfree86/os-support
 
-nodist_libac_la_SOURCES = ac_context.c ac_import.c
+nodist_libac_la_SOURCES =
diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am
index a8b57bc4f..b9546ed4e 100644
--- a/GL/mesa/tnl/Makefile.am
+++ b/GL/mesa/tnl/Makefile.am
@@ -16,13 +16,10 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I.. \
            -I$(top_srcdir)/hw/xfree86/os-support
 
-nodist_libtnl_la_SOURCES = t_array_api.c \
-                      t_array_import.c \
+nodist_libtnl_la_SOURCES = \
+                      t_draw.c \
                       t_context.c \
                       t_pipeline.c \
-                      t_save_api.c \
-                      t_save_loopback.c \
-                      t_save_playback.c \
                       t_vb_arbprogram.c \
                       t_vb_arbprogram_sse.c \
                       t_vb_arbshader.c \
@@ -39,9 +36,4 @@ nodist_libtnl_la_SOURCES = t_array_api.c \
                       t_vertex.c \
                       t_vertex_generic.c \
                       t_vertex_sse.c \
-                      t_vp_build.c \
-                      t_vtx_api.c \
-                      t_vtx_eval.c \
-                      t_vtx_exec.c \
-                      t_vtx_generic.c \
-                      t_vtx_x86.c
+                      t_vp_build.c
diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index 014812e45..5745e369f 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -238,14 +238,31 @@ symlink_mesa_math() {
     action mathmod.h
 }
 
-symlink_mesa_ac() {
-    src_dir src/mesa/array_cache
-    dst_dir mesa/array_cache
+symlink_mesa_vbo() {
+    src_dir src/mesa/vbo
+    dst_dir mesa/vbo
 
-    action ac_context.c
-    action ac_context.h
-    action ac_import.c
-    action acache.h
+    action vbo.h
+    action vbo_attrib.h
+    action vbo_attrib_tmp.h
+    action vbo_context.c
+    action vbo_context.h
+    action vbo_exec.c
+    action vbo_exec.h
+    action vbo_exec_api.c
+    action vbo_exec_array.c
+    action vbo_exec_draw.c
+    action vbo_exec_eval.c
+    action vbo_rebase.c
+    action vbo_split.c
+    action vbo_split.h
+    action vbo_split_copy.c
+    action vbo_split_inplace.c
+    action vbo_save.c
+    action vbo_save.h
+    action vbo_save_api.c
+    action vbo_save_draw.c
+    action vbo_save_loopback.c
 }
 
 symlink_mesa_swrast() {
@@ -332,18 +349,11 @@ symlink_mesa_tnl() {
     src_dir src/mesa/tnl
     dst_dir mesa/tnl
 
-    action t_array_api.c
-    action t_array_api.h
-    action t_array_import.c
-    action t_array_import.h
     action t_context.c
+    action t_draw.c
     action t_context.h
     action t_pipeline.c
     action t_pipeline.h
-    action t_save_api.c
-    action t_save_api.h
-    action t_save_loopback.c
-    action t_save_playback.c
     action t_vb_arbprogram.c
     action t_vb_arbprogram.h
     action t_vb_arbprogram_sse.c
@@ -367,12 +377,6 @@ symlink_mesa_tnl() {
     action t_vertex_sse.c
     action t_vp_build.c
     action t_vp_build.h
-    action t_vtx_api.c
-    action t_vtx_api.h
-    action t_vtx_eval.c
-    action t_vtx_exec.c
-    action t_vtx_generic.c
-    action t_vtx_x86.c
     action tnl.h
 }
 
@@ -523,7 +527,7 @@ symlink_mesa_x8664() {
 symlink_mesa() {
     symlink_mesa_main
     symlink_mesa_math
-    symlink_mesa_ac
+    symlink_mesa_vbo
     symlink_mesa_swrast
     symlink_mesa_ss
     symlink_mesa_tnl