Merge branch 'mesa_7_6_branch'

[mesa.git] / src / mesa / main / context.c

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 4c69e688da69e96d4a1a747ba7cdceeed46551ce..f6d4ac459579dde85c03b3f69034fae8d431e7a3 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -149,7 +149,6 @@
 #include "version.h"
 #include "viewport.h"
 #include "vtxfmt.h"
-#include "drivers/common/meta.h"
 #include "glapi/glthread.h"
 #include "glapi/glapioffsets.h"
 #include "glapi/glapitable.h"
@@ -927,8 +926,6 @@ _mesa_initialize_context(GLcontext *ctx,
    _mesa_initialize_context_extra(ctx);
 #endif
 
-   _mesa_meta_init(ctx);
-
    ctx->FirstTimeCurrent = GL_TRUE;
 
    return GL_TRUE;
@@ -994,8 +991,6 @@ _mesa_free_context_data( GLcontext *ctx )
       _mesa_make_current(ctx, NULL, NULL);
    }
 
-   _mesa_meta_free(ctx);
-
    /* unreference WinSysDraw/Read buffers */
    _mesa_reference_framebuffer(&ctx->WinSysDrawBuffer, NULL);
    _mesa_reference_framebuffer(&ctx->WinSysReadBuffer, NULL);