diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-09-10 01:21:11 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-09-13 20:38:25 +0200 |
| commit | 275c073c6a49eacac85c21dc618d3c577f4d0495 (patch) | |
| tree | e86b42bece49ba91dfc45e3f0c738781d08dcd80 /src/gallium/drivers/radeonsi/si_state_shaders.c | |
| parent | b89854b0c7927817293aaec196c41b991cbcf377 (diff) | |
| download | external_mesa3d-275c073c6a49eacac85c21dc618d3c577f4d0495.zip external_mesa3d-275c073c6a49eacac85c21dc618d3c577f4d0495.tar.gz external_mesa3d-275c073c6a49eacac85c21dc618d3c577f4d0495.tar.bz2 | |
radeonsi: export SampleMask from pixel shaders at full rate
Heaven and Valley write gl_SampleMask and not Z.
Use 16_ABGR instead of 32_ABGR if Z isn't written.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_state_shaders.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_shaders.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index b4f19fe..816aadc 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -748,10 +748,9 @@ static void si_shader_ps(struct si_shader *shader) si_pm4_set_reg(pm4, R_0286D8_SPI_PS_IN_CONTROL, spi_ps_in_control); 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 : - V_028710_SPI_SHADER_ZERO); + si_get_spi_shader_z_format(info->writes_z, + info->writes_stencil, + info->writes_samplemask)); si_pm4_set_reg(pm4, R_028714_SPI_SHADER_COL_FORMAT, spi_shader_col_format); si_pm4_set_reg(pm4, R_02823C_CB_SHADER_MASK, cb_shader_mask); |