diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2006-10-29 09:52:36 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2006-10-29 09:52:36 +0000 |
| commit | 0a0fb5e0b3cfe61749af41d4200d42982b551cef (patch) | |
| tree | 9af6ceaa5b52eef104bab6b2ee87f590a082473a /src/mesa/drivers/osmesa | |
| parent | 72b68455eb02460e2e9a64fff2448596a183923b (diff) | |
switch over to vbo module
Diffstat (limited to 'src/mesa/drivers/osmesa')
| -rw-r--r-- | src/mesa/drivers/osmesa/osmesa.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index 0b027eddec..42a1bb5123 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -41,7 +41,6 @@ #include "imports.h" #include "mtypes.h" #include "renderbuffer.h" -#include "array_cache/acache.h" #include "swrast/swrast.h" #include "swrast_setup/swrast_setup.h" #include "swrast/s_context.h" @@ -51,6 +50,7 @@ #include "tnl/t_context.h" #include "tnl/t_pipeline.h" #include "drivers/common/driverfuncs.h" +#include "vbo/vbo_context.h" @@ -110,7 +110,6 @@ osmesa_update_state( GLcontext *ctx, GLuint new_state ) /* easy - just propogate */ _swrast_InvalidateState( ctx, new_state ); _swsetup_InvalidateState( ctx, new_state ); - _ac_InvalidateState( ctx, new_state ); _tnl_InvalidateState( ctx, new_state ); } @@ -1261,7 +1260,7 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits, TNLcontext *tnl; if (!_swrast_CreateContext( ctx ) || - !_ac_CreateContext( ctx ) || + !_vbo_CreateContext( ctx ) || !_tnl_CreateContext( ctx ) || !_swsetup_CreateContext( ctx )) { _mesa_destroy_visual(osmesa->gl_visual); @@ -1299,7 +1298,7 @@ OSMesaDestroyContext( OSMesaContext osmesa ) if (osmesa) { _swsetup_DestroyContext( &osmesa->mesa ); _tnl_DestroyContext( &osmesa->mesa ); - _ac_DestroyContext( &osmesa->mesa ); + _vbo_DestroyContext( &osmesa->mesa ); _swrast_DestroyContext( &osmesa->mesa ); _mesa_destroy_visual( osmesa->gl_visual ); |