diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-19 08:45:20 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-19 08:45:20 -0600 |
| commit | 8f3bdeaad610d7d5a5c6e73e1e9c721219595754 (patch) | |
| tree | 3375ac7eb94edf1914da7faafcedea32a2bd505b /src/mesa/drivers/dri/savage | |
| parent | f7c2d4fee3104008c21078879cbc5720d7bc1be6 (diff) | |
| parent | e3a34cc7f6c9f959cdc2af4486e84587fab4d0d7 (diff) | |
Merge branch '7.8'
Conflicts:
src/gallium/auxiliary/draw/draw_context.c
src/gallium/auxiliary/draw/draw_pipe_aaline.c
src/gallium/drivers/llvmpipe/lp_context.c
Diffstat (limited to 'src/mesa/drivers/dri/savage')
| -rw-r--r-- | src/mesa/drivers/dri/savage/savage_xmesa.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c index 6f07ac275e..c3a53ea5e2 100644 --- a/src/mesa/drivers/dri/savage/savage_xmesa.c +++ b/src/mesa/drivers/dri/savage/savage_xmesa.c @@ -44,6 +44,7 @@ #include "tnl/t_pipeline.h" #include "drivers/common/driverfuncs.h" +#include "drivers/common/meta.h" #include "savagedd.h" #include "savagestate.h" @@ -473,6 +474,8 @@ savageCreateContext( const __GLcontextModes *mesaVis, imesa->CurrentTexObj[0] = 0; imesa->CurrentTexObj[1] = 0; + _mesa_meta_init( ctx ); + /* Initialize the software rasterizer and helper modules. */ _swrast_CreateContext( ctx ); @@ -564,6 +567,8 @@ savageDestroyContext(__DRIcontext *driContextPriv) free(imesa->cmdBuf.base); free(imesa->clientVtxBuf.buf); + _mesa_meta_free( imesa->glCtx ); + _swsetup_DestroyContext(imesa->glCtx ); _tnl_DestroyContext( imesa->glCtx ); _vbo_DestroyContext( imesa->glCtx ); |