i965: old VS: Use brw_vue_map instead of implicit assumptions about VUE structure.

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_common.c

diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
index 7361adffcf7f60ad8501955813ed612afe7c83da..e7a6623cf84ca216812fffde6dcf78e45d931499 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_common.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
@@ -436,7 +436,6 @@ void radeonCopyBuffer( __DRIdrawable *dPriv,
                       const drm_clip_rect_t      *rect)
 {
        radeonContextPtr rmesa;
-       struct radeon_framebuffer *rfb;
        GLint nbox, i, ret;
 
        assert(dPriv);
@@ -447,8 +446,6 @@ void radeonCopyBuffer( __DRIdrawable *dPriv,
 
        LOCK_HARDWARE(rmesa);
 
-       rfb = dPriv->driverPrivate;
-
        if ( RADEON_DEBUG & RADEON_IOCTL ) {
                fprintf( stderr, "\n%s( %p )\n\n", __FUNCTION__, (void *) rmesa->glCtx );
        }
@@ -527,8 +524,6 @@ static GLboolean radeonPageFlip( __DRIdrawable *dPriv )
 {
        radeonContextPtr radeon;
        GLint ret;
-       __DRIscreen *psp;
-       struct radeon_renderbuffer *rrb;
        struct radeon_framebuffer *rfb;
 
        assert(dPriv);
@@ -537,9 +532,6 @@ static GLboolean radeonPageFlip( __DRIdrawable *dPriv )
 
        radeon = (radeonContextPtr) dPriv->driContextPriv->driverPrivate;
        rfb = dPriv->driverPrivate;
-       rrb = (void *)rfb->base.Attachment[BUFFER_FRONT_LEFT].Renderbuffer;
-
-       psp = dPriv->driScreenPriv;
 
        LOCK_HARDWARE(radeon);
 
@@ -905,7 +897,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);
                }
@@ -966,7 +958,7 @@ static void radeon_print_state_atom(radeonContextPtr radeon, struct radeon_state
 
        fprintf(stderr, "  emit %s %d/%d\n", state->name, dwords, state->cmd_size);
 
-       if (radeon_is_debug_enabled(RADEON_STATE, RADEON_TRACE)) {
+       if (state->cmd && radeon_is_debug_enabled(RADEON_STATE, RADEON_TRACE)) {
                if (dwords > state->cmd_size)
                        dwords = state->cmd_size;
                for (i = 0; i < dwords;) {