diff options
| author | Marek Olšák <[email protected]> | 2015-12-10 13:16:58 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2015-12-11 15:25:11 +0100 |
| commit | 51603af3901b2e401d2009ec27b99996fc9ccffb (patch) | |
| tree | ab26366087af3c04dbe790042c750e04f054bd1a | |
| parent | b5b87c4ed1dfd58aec8905e0514c9ba92ba83e1d (diff) | |
radeonsi: use tgsi_shader_info::colors_written
Reviewed-by: Alex Deucher <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_shaders.c | 9 |
3 files changed, 1 insertions, 11 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index f089dc73ca1..b0c8680ecb3 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -213,7 +213,6 @@ struct si_shader_selector { /* masks of "get_unique_index" bits */ uint64_t outputs_written; uint32_t patch_outputs_written; - uint32_t ps_colors_written; }; /* Valid shader configurations: diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 9f9f3d6610b..bbe15497b67 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -267,7 +267,7 @@ static void si_emit_cb_target_mask(struct si_context *sctx, struct r600_atom *at */ if (blend && blend->dual_src_blend && sctx->ps_shader.cso && - (sctx->ps_shader.cso->ps_colors_written & 0x3) != 0x3) + (sctx->ps_shader.cso->info.colors_written & 0x3) != 0x3) mask = 0; radeon_set_context_reg(cs, R_028238_CB_TARGET_MASK, mask); diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 4555ca450b6..f0147ce2bfc 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -730,15 +730,6 @@ static void *si_create_shader_selector(struct pipe_context *ctx, } sel->esgs_itemsize = util_last_bit64(sel->outputs_written) * 16; break; - case PIPE_SHADER_FRAGMENT: - for (i = 0; i < sel->info.num_outputs; i++) { - unsigned name = sel->info.output_semantic_name[i]; - unsigned index = sel->info.output_semantic_index[i]; - - if (name == TGSI_SEMANTIC_COLOR) - sel->ps_colors_written |= 1 << index; - } - break; } if (sscreen->b.debug_flags & DBG_PRECOMPILE) { |