Mesa (7.8): savage: call _mesa_meta_init/free()
Brian Paul
brianp at kemper.freedesktop.org
Fri Apr 16 14:45:16 UTC 2010
Module: Mesa
Branch: 7.8
Commit: 885048232fb715b0646d52ff35305941a25f1382
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=885048232fb715b0646d52ff35305941a25f1382
Author: Tormod Volden <lists.tormod at gmail.com>
Date: Thu Apr 15 10:13:53 2010 -0700
savage: call _mesa_meta_init/free()
Fixes crash when using _mesa_CopyTexImage2D.
Bug #27652.
Signed-off-by: Tormod Volden <debian.tormod at gmail.com>
Signed-off-by: Brian Paul <brianp at vmware.com>
---
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 );
More information about the mesa-commit
mailing list