Merge branch 'master' of git+ssh://keithw@git.freedesktop.org/git/mesa/mesa into...

[mesa.git] / src / mesa / drivers / dri / tdfx / tdfx_context.c

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c
index bd9dade89b59ca279e13207dfbe08c09f113f8e0..a9163f49a8f80b01a9e131c6e2fdde3b602d0abd 100644 (file)
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c
@@ -49,7 +49,7 @@
 
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"
-#include "array_cache/acache.h"
+#include "vbo/vbo.h"
 
 #include "tnl/tnl.h"
 #include "tnl/t_pipeline.h"
@@ -328,7 +328,7 @@ GLboolean tdfxCreateContext( const __GLcontextModes *mesaVis,
    /* Initialize the software rasterizer and helper modules.
     */
    _swrast_CreateContext( ctx );
-   _ac_CreateContext( ctx );
+   _vbo_CreateContext( ctx );
    _tnl_CreateContext( ctx );
    _swsetup_CreateContext( ctx );
 
@@ -609,7 +609,7 @@ tdfxDestroyContext( __DRIcontextPrivate *driContextPriv )
 
       _swsetup_DestroyContext( fxMesa->glCtx );
       _tnl_DestroyContext( fxMesa->glCtx );
-      _ac_DestroyContext( fxMesa->glCtx );
+      _vbo_DestroyContext( fxMesa->glCtx );
       _swrast_DestroyContext( fxMesa->glCtx );
 
       tdfxFreeVB( fxMesa->glCtx );