diff options
| author | Ian Romanick <[email protected]> | 2007-02-20 15:19:23 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2007-02-20 15:19:23 -0800 |
| commit | a4b344baa2484c65a1618f3cce3a94c91dea8ef7 (patch) | |
| tree | f2d3e6571c94378db5a87d882c039909d6a47d3f /src/mesa/drivers/beos | |
| parent | f0bcee5db0523edaacbd1fb0eaa74b435ae7c188 (diff) | |
| parent | 440759c2cdfdd9a7fbc6500fca2afa519126c1a7 (diff) | |
Merge branch 'master' of ssh+git://[email protected]/git/mesa/mesa
Diffstat (limited to 'src/mesa/drivers/beos')
| -rw-r--r-- | src/mesa/drivers/beos/GLView.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/beos/GLView.cpp b/src/mesa/drivers/beos/GLView.cpp index 45473a8ef27..9e4a7ebe56e 100644 --- a/src/mesa/drivers/beos/GLView.cpp +++ b/src/mesa/drivers/beos/GLView.cpp @@ -43,7 +43,7 @@ extern "C" { #include "texobj.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 "swrast/s_context.h" @@ -344,7 +344,7 @@ BGLView::BGLView(BRect rect, char *name, /* Initialize the software rasterizer and helper modules. */ _swrast_CreateContext(ctx); - _ac_CreateContext(ctx); + _vbo_CreateContext(ctx); _tnl_CreateContext(ctx); _swsetup_CreateContext(ctx); _swsetup_Wakeup(ctx); @@ -830,7 +830,7 @@ void MesaDriver::UpdateState( GLcontext *ctx, GLuint new_state ) _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 ); if (ctx->Color.DrawBuffer[0] == GL_FRONT) { |