AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/radeon: remove predicate_drawing flag

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák
2015-11-07 16:24:47 +01:00
parent 12596cfd4c
commit 70c40cc989
4 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r600/r600_state_common.c
+1 -1
View File
@@ -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)) {
src/gallium/drivers/radeon/r600_pipe_common.h
-1
View File
@@ -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.
src/gallium/drivers/radeon/r600_query.c
-1
View File
@@ -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;
src/gallium/drivers/radeonsi/si_state_draw.c
+1 -1
View File
@@ -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 =