radeon: Remove setup of the old dri/ meta code, which is now unused.
authorEric Anholt <eric@anholt.net>
Sat, 12 Feb 2011 20:23:43 +0000 (12:23 -0800)
committerEric Anholt <eric@anholt.net>
Sat, 12 Feb 2011 20:23:43 +0000 (12:23 -0800)
src/mesa/drivers/dri/radeon/radeon_common.c
src/mesa/drivers/dri/radeon/radeon_common_context.c
src/mesa/drivers/dri/radeon/radeon_common_context.h

index 7361adf..0d73c0e 100644 (file)
@@ -905,7 +905,7 @@ void radeon_viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GL
        if (!driContext->driScreenPriv->dri2.enabled)
                return;
 
-       if (!radeon->meta.internal_viewport_call && ctx->DrawBuffer->Name == 0) {
+       if (ctx->DrawBuffer->Name == 0) {
                if (radeon->is_front_buffer_rendering) {
                        ctx->Driver.Flush(ctx);
                }
index c36cb9d..405aecb 100644 (file)
@@ -212,8 +212,6 @@ GLboolean radeonInitContext(radeonContextPtr radeon,
        ctx = radeon->glCtx;
        driContextPriv->driverPrivate = radeon;
 
-       meta_init_metaops(ctx, &radeon->meta);
-
        _mesa_meta_init(ctx);
 
        /* DRI fields */
@@ -320,7 +318,6 @@ void radeonDestroyContext(__DRIcontext *driContextPriv )
 
        radeonFreeDmaRegions(radeon);
        radeonReleaseArrays(radeon->glCtx, ~0);
-       meta_destroy_metaops(&radeon->meta);
        if (radeon->vtbl.free_context)
                radeon->vtbl.free_context(radeon->glCtx);
        _swsetup_DestroyContext( radeon->glCtx );
index c62913a..3895ab8 100644 (file)
@@ -14,7 +14,6 @@
 #include "dri_util.h"
 #include "tnl/t_vertex.h"
 
-#include "dri_metaops.h"
 struct radeon_context;
 
 #include "radeon_bocs_wrapper.h"
@@ -509,8 +508,6 @@ struct radeon_context {
     */
    GLboolean is_front_buffer_reading;
 
-   struct dri_metaops meta;
-
    struct {
        struct radeon_query_object *current;
        struct radeon_state_atom queryobj;