diff options
author | Tormod Volden <lists.tormod@gmail.com> | 2010-04-15 10:13:53 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2010-04-16 08:24:53 -0600 |
commit | 885048232fb715b0646d52ff35305941a25f1382 (patch) | |
tree | fad3a282fb3d251b6aa4adfd0e71251ef4eb2d5f /src/mesa | |
parent | b3a68cdc6f4bf2c006aa01f8980536e8e520d62a (diff) | |
download | external_mesa3d-885048232fb715b0646d52ff35305941a25f1382.zip external_mesa3d-885048232fb715b0646d52ff35305941a25f1382.tar.gz external_mesa3d-885048232fb715b0646d52ff35305941a25f1382.tar.bz2 |
savage: call _mesa_meta_init/free()
Fixes crash when using _mesa_CopyTexImage2D.
Bug #27652.
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa')
-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 6f07ac2..c3a53ea 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 ); |