diff options
author | Ian Romanick <idr@us.ibm.com> | 2007-02-20 15:19:23 -0800 |
---|---|---|
committer | Ian Romanick <idr@us.ibm.com> | 2007-02-20 15:19:23 -0800 |
commit | a4b344baa2484c65a1618f3cce3a94c91dea8ef7 (patch) | |
tree | f2d3e6571c94378db5a87d882c039909d6a47d3f /src/mesa/drivers/fbdev | |
parent | f0bcee5db0523edaacbd1fb0eaa74b435ae7c188 (diff) | |
parent | 440759c2cdfdd9a7fbc6500fca2afa519126c1a7 (diff) |
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/drivers/fbdev')
-rw-r--r-- | src/mesa/drivers/fbdev/glfbdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/fbdev/glfbdev.c b/src/mesa/drivers/fbdev/glfbdev.c index bd9d3ac0ad..f9d57dbdd8 100644 --- a/src/mesa/drivers/fbdev/glfbdev.c +++ b/src/mesa/drivers/fbdev/glfbdev.c @@ -54,7 +54,7 @@ #include "texformat.h" #include "teximage.h" #include "texstore.h" -#include "array_cache/acache.h" +#include "vbo/vbo.h" #include "swrast/swrast.h" #include "swrast_setup/swrast_setup.h" #include "tnl/tnl.h" @@ -143,7 +143,7 @@ update_state( GLcontext *ctx, GLuint new_state ) /* not much to do here - pass it on */ _swrast_InvalidateState( ctx, new_state ); _swsetup_InvalidateState( ctx, new_state ); - _ac_InvalidateState( ctx, new_state ); + _vbo_InvalidateState( ctx, new_state ); _tnl_InvalidateState( ctx, new_state ); } @@ -776,7 +776,7 @@ glFBDevCreateContext( const GLFBDevVisualPtr visual, GLFBDevContextPtr share ) /* Create module contexts */ glctx = (GLcontext *) &ctx->glcontext; _swrast_CreateContext( glctx ); - _ac_CreateContext( glctx ); + _vbo_CreateContext( glctx ); _tnl_CreateContext( glctx ); _swsetup_CreateContext( glctx ); _swsetup_Wakeup( glctx ); |