r600g: remove redundant variable r600_pipe_context::blit

diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 372bfc23c3739dd316bbae29b2e790e8a21a775c..3eba0ad06369366ae04d6bd859df0dc46c8da205 100644 (file)
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -45,7 +45,6 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op
 {
        struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
 
-       rctx->blit = true;
        r600_context_queries_suspend(&rctx->ctx);
 
        util_blitter_save_blend(rctx->blitter, rctx->states[R600_PIPE_STATE_BLEND]);
@@ -98,7 +97,6 @@ static void r600_blitter_end(struct pipe_context *ctx)
                rctx->saved_render_cond = NULL;
        }
        r600_context_queries_resume(&rctx->ctx, FALSE);
-       rctx->blit = false;
 }
 
 static unsigned u_num_layers(struct pipe_resource *r, unsigned level)

diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index dfb1065e371900a6b571c4eba588c38b59ad5ed6..330e3202bab5fc13d39a1f096a022aceb2fc4a29 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -229,7 +229,6 @@ struct r600_pipe_context {
 
        struct u_vbuf_mgr               *vbuf_mgr;
        struct util_slab_mempool        pool_transfers;
-       boolean                         blit;
        boolean                         have_depth_texture, have_depth_fb;
 
        unsigned default_ps_gprs, default_vs_gprs;

diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index f1d88e859cb877b43eeb8b91b48b89ea86610327..b24bb549371d0b920e1b0aec3f6e557457b494f3 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -24,6 +24,7 @@
  * Authors: Dave Airlie <airlied@redhat.com>
  *          Jerome Glisse <jglisse@redhat.com>
  */
+#include "util/u_blitter.h"
 #include "util/u_memory.h"
 #include "util/u_format.h"
 #include "pipebuffer/pb_buffer.h"
@@ -554,7 +555,7 @@ static int r600_shader_rebuild(struct pipe_context * ctx, struct r600_pipe_shade
 
 static void r600_update_derived_state(struct r600_pipe_context *rctx)
 {
-       if (!rctx->blit) {
+       if (!rctx->blitter->running) {
                if (rctx->have_depth_fb || rctx->have_depth_texture)
                        r600_flush_depth_textures(rctx);
        }