gallium/radeon: remove predicate_drawing flag

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 28aedffc42d16f838aa9896985013b26b9318b78..5cf520899cf040cafb57844006ebe55b301a3ad4 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -1478,7 +1478,7 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
        struct pipe_draw_info info = *dinfo;
        struct pipe_index_buffer ib = {};
        struct radeon_winsys_cs *cs = rctx->b.gfx.cs;
-       bool render_cond_bit = rctx->b.predicate_drawing && !rctx->b.render_cond_force_off;
+       bool render_cond_bit = rctx->b.current_render_cond && !rctx->b.render_cond_force_off;
        uint64_t mask;
 
        if (!info.indirect && !info.count && (info.indexed || !info.count_from_stream_output)) {

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index 09465ae0596d8628249d531ae2ae1b68ec180af6..ba9000f74ec2a0828e0300cc06465225b2d92750 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -421,7 +421,6 @@ struct r600_common_context {
        struct pipe_query               *current_render_cond;
        unsigned                        current_render_cond_mode;
        boolean                         current_render_cond_cond;
-       bool                            predicate_drawing;
        bool                            render_cond_force_off; /* for u_blitter */
 
        /* MSAA sample locations.

diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index 145b629deb1ddff487631fd1460ad790079f0bf0..9f92587a54b4de9c1efcf2d783bf145a1856bee4 100644 (file)
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -834,7 +834,6 @@ static void r600_render_condition(struct pipe_context *ctx,
        rctx->current_render_cond = query;
        rctx->current_render_cond_cond = condition;
        rctx->current_render_cond_mode = mode;
-       rctx->predicate_drawing = query != NULL;
 
        /* Compute the size of SET_PREDICATION packets. */
        atom->num_dw = 0;

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index ebc01e8e4aeb424c4e284f785d4322d6c741d77a..79e88765d045ac8bcde26071faa334b87bee5800 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -457,7 +457,7 @@ static void si_emit_draw_packets(struct si_context *sctx,
 {
        struct radeon_winsys_cs *cs = sctx->b.gfx.cs;
        unsigned sh_base_reg = sctx->shader_userdata.sh_base[PIPE_SHADER_VERTEX];
-       bool render_cond_bit = sctx->b.predicate_drawing && !sctx->b.render_cond_force_off;
+       bool render_cond_bit = sctx->b.current_render_cond && !sctx->b.render_cond_force_off;
 
        if (info->count_from_stream_output) {
                struct r600_so_target *t =