r600g: remove the now-useless internal flush callback

diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index b6375c25f8c4efef262e270b0bf39bf381ee2af8..1d6d99740db124b5dbf00eee2254223c7bc3342d 100644 (file)
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -957,7 +957,7 @@ void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw,
 
        /* Flush if there's not enough space. */
        if (num_dw > RADEON_MAX_CMDBUF_DWORDS) {
-               ctx->flush(ctx->pipe, RADEON_FLUSH_ASYNC);
+               r600_flush(&ctx->context, NULL, RADEON_FLUSH_ASYNC);
        }
 }
 

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index d61855d7498b4b1361a2516fb4940df22d9f3d9f..bd68eff8f73ab00c876d3203babcfe581f32571e 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -259,8 +259,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
                return NULL;
        }
 
-       rctx->pipe = &rctx->context;
-       rctx->flush = r600_flush_from_winsys;
        rctx->ws->cs_set_flush_callback(rctx->cs, r600_flush_from_winsys, rctx);
 
        util_slab_create(&rctx->pool_transfers,

diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index 41ea38d86fa2a99662c710834aeabe3c28bc38e5..5ed07cb74e253235fb35f53dd7ccbf8dadf7b201 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -254,9 +254,6 @@ struct r600_context {
        /* Below are variables from the old r600_context.
         */
        struct radeon_winsys_cs *cs;
-       struct pipe_context     *pipe;
-
-       void (*flush)(void *pipe, unsigned flags);
 
        struct r600_range       *range;
        unsigned                nblocks;