Mesa (master): intel: Remove setup of the old dri/ meta code, which is now unused.

Eric Anholt anholt at kemper.freedesktop.org
Sat Feb 12 20:27:22 UTC 2011


Module: Mesa
Branch: master
Commit: 47589c17b0ea34f2c77c8c9e633349af6d1a2f10
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=47589c17b0ea34f2c77c8c9e633349af6d1a2f10

Author: Eric Anholt <eric at anholt.net>
Date:   Sat Feb 12 11:52:06 2011 -0800

intel: Remove setup of the old dri/ meta code, which is now unused.

---

 src/mesa/drivers/dri/intel/intel_context.c |    5 +----
 src/mesa/drivers/dri/intel/intel_context.h |    3 ---
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 52af8ee..65c4148 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -487,7 +487,7 @@ intel_viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
     if (intel->saved_viewport)
 	intel->saved_viewport(ctx, x, y, w, h);
 
-    if (!intel->meta.internal_viewport_call && ctx->DrawBuffer->Name == 0) {
+    if (ctx->DrawBuffer->Name == 0) {
        dri2InvalidateDrawable(driContext->driDrawablePriv);
        dri2InvalidateDrawable(driContext->driReadablePriv);
     }
@@ -805,7 +805,6 @@ intelInitContext(struct intel_context *intel,
     */
    _mesa_init_point(ctx);
 
-   meta_init_metaops(ctx, &intel->meta);
    if (intel->gen >= 4) {
       ctx->Const.sRGBCapable = GL_TRUE;
       if (MAX_WIDTH > 8192)
@@ -912,8 +911,6 @@ intelDestroyContext(__DRIcontext * driContextPriv)
 
       _mesa_meta_free(&intel->ctx);
 
-      meta_destroy_metaops(&intel->meta);
-
       intel->vtbl.destroy(intel);
 
       _swsetup_DestroyContext(&intel->ctx);
diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h
index fd3c3ba..134e07e 100644
--- a/src/mesa/drivers/dri/intel/intel_context.h
+++ b/src/mesa/drivers/dri/intel/intel_context.h
@@ -32,7 +32,6 @@
 #include <stdbool.h>
 #include "main/mtypes.h"
 #include "main/mm.h"
-#include "dri_metaops.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -152,8 +151,6 @@ struct intel_context
       bool (*render_target_supported)(gl_format format);
    } vtbl;
 
-   struct dri_metaops meta;
-
    GLbitfield Fallback;  /**< mask of INTEL_FALLBACK_x bits */
    GLuint NewGLState;
 




More information about the mesa-commit mailing list