Mesa (master): r600g: remove redundant variable r600_pipe_context::blit
Marek Olšák
mareko at kemper.freedesktop.org
Thu Oct 27 10:28:37 UTC 2011
Module: Mesa
Branch: master
Commit: a19e6a8f2840be9a59e46c8d408658715ae47bf0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a19e6a8f2840be9a59e46c8d408658715ae47bf0
Author: Marek Olšák <maraeo at gmail.com>
Date: Thu Oct 27 12:27:34 2011 +0200
r600g: remove redundant variable r600_pipe_context::blit
---
src/gallium/drivers/r600/r600_blit.c | 2 --
src/gallium/drivers/r600/r600_pipe.h | 1 -
src/gallium/drivers/r600/r600_state_common.c | 3 ++-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 372bfc2..3eba0ad 100644
--- 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 dfb1065..330e320 100644
--- 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 f1d88e8..b24bb54 100644
--- 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 at redhat.com>
* Jerome Glisse <jglisse at 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);
}
More information about the mesa-commit
mailing list