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_shader.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_shader.c')
-rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 63 |
1 files changed, 51 insertions, 12 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 6801722..6d30d1c 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2928,6 +2928,25 @@ struct si_ps_exports { LLVMValueRef args[10][9]; }; +unsigned si_get_spi_shader_z_format(bool writes_z, bool writes_stencil, + bool writes_samplemask) +{ + if (writes_z) { + /* Z needs 32 bits. */ + if (writes_samplemask) + return V_028710_SPI_SHADER_32_ABGR; + else if (writes_stencil) + return V_028710_SPI_SHADER_32_GR; + else + return V_028710_SPI_SHADER_32_R; + } else if (writes_stencil || writes_samplemask) { + /* Both stencil and sample mask need only 16 bits. */ + return V_028710_SPI_SHADER_UINT16_ABGR; + } else { + return V_028710_SPI_SHADER_ZERO; + } +} + static void si_export_mrt_z(struct lp_build_tgsi_context *bld_base, LLVMValueRef depth, LLVMValueRef stencil, LLVMValueRef samplemask, struct si_ps_exports *exp) @@ -2937,6 +2956,9 @@ static void si_export_mrt_z(struct lp_build_tgsi_context *bld_base, struct lp_build_context *uint = &bld_base->uint_bld; LLVMValueRef args[9]; unsigned mask = 0; + unsigned format = si_get_spi_shader_z_format(depth != NULL, + stencil != NULL, + samplemask != NULL); assert(depth || stencil || samplemask); @@ -2952,19 +2974,36 @@ static void si_export_mrt_z(struct lp_build_tgsi_context *bld_base, args[7] = base->undef; /* B, sample mask */ args[8] = base->undef; /* A, alpha to mask */ - if (depth) { - args[5] = depth; - mask |= 0x1; - } - - if (stencil) { - args[6] = stencil; - mask |= 0x2; - } + if (format == V_028710_SPI_SHADER_UINT16_ABGR) { + assert(!depth); + args[4] = uint->one; /* COMPR flag */ - if (samplemask) { - args[7] = samplemask; - mask |= 0x4; + if (stencil) { + /* Stencil should be in X[23:16]. */ + stencil = bitcast(bld_base, TGSI_TYPE_UNSIGNED, stencil); + stencil = LLVMBuildShl(base->gallivm->builder, stencil, + LLVMConstInt(ctx->i32, 16, 0), ""); + args[5] = bitcast(bld_base, TGSI_TYPE_FLOAT, stencil); + mask |= 0x3; + } + if (samplemask) { + /* SampleMask should be in Y[15:0]. */ + args[6] = samplemask; + mask |= 0xc; + } + } else { + if (depth) { + args[5] = depth; + mask |= 0x1; + } + if (stencil) { + args[6] = stencil; + mask |= 0x2; + } + if (samplemask) { + args[7] = samplemask; + mask |= 0x4; + } } /* SI (except OLAND) has a bug that it only looks |