diff options
| author | Nicolai Hähnle <[email protected]> | 2016-01-22 12:37:03 -0500 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2016-01-22 12:40:26 -0500 |
| commit | d76bd85c35d6f68a46ec073712f398da71afb0a7 (patch) | |
| tree | 6a5651357f18ec8c5393f71d904eb1780e2d2248 | |
| parent | 843855bbf0da2204ce536623ba957bfa83fdbd52 (diff) | |
Revert "radeonsi: fix discard-only fragment shaders (v2)"
This reverts commit 843855bbf0da2204ce536623ba957bfa83fdbd52.
It became redundant due to Marek's earlier pushed 8667a1ae which achieves
the same thing.
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_shaders.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index fae804c6ca9..79f2335b9b5 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -438,7 +438,6 @@ static void si_shader_ps(struct si_shader *shader) unsigned spi_baryc_cntl = S_0286E0_FRONT_FACE_ALL_BITS(1); uint64_t va; bool has_centroid; - bool writes_execmask; pm4 = shader->pm4 = CALLOC_STRUCT(si_pm4_state); @@ -493,13 +492,10 @@ static void si_shader_ps(struct si_shader *shader) si_pm4_set_reg(pm4, R_0286E0_SPI_BARYC_CNTL, spi_baryc_cntl); si_pm4_set_reg(pm4, R_0286D8_SPI_PS_IN_CONTROL, spi_ps_in_control); - writes_execmask = info->uses_kill || - shader->key.ps.alpha_func != PIPE_FUNC_ALWAYS; si_pm4_set_reg(pm4, R_028710_SPI_SHADER_Z_FORMAT, info->writes_samplemask ? V_028710_SPI_SHADER_32_ABGR : info->writes_stencil ? V_028710_SPI_SHADER_32_GR : info->writes_z ? V_028710_SPI_SHADER_32_R : - (writes_execmask && !info->num_outputs) ? V_028710_SPI_SHADER_32_R : V_028710_SPI_SHADER_ZERO); si_pm4_set_reg(pm4, R_028714_SPI_SHADER_COL_FORMAT, spi_shader_col_format); |