summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2019-02-18 17:42:10 +0100
committerDylan Baker <dylan@pnwbakers.com>2019-02-19 07:07:22 -0800
commit110500cc8ab5dfc2b0d5c464155f85b1bccba779 (patch)
tree951211398bfdfc48bb59d460c435f1c7916abc5c
parent0b9f6ebfbbb792e6b592044a1577a3e3fae6e50c (diff)
radv: fix writing the alpha channel of MRT0 when alpha coverage is enabled
This version is better and safer. Cc: 18.3 19.0 <mesa-stable@lists.freedesktop.org> Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> (cherry picked from commit 47616810ed7cfce21d239391131ad9a5ef558b52)
-rw-r--r--src/amd/vulkan/radv_pipeline.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index efd675c4dc4..03e9369e094 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -511,13 +511,6 @@ radv_pipeline_compute_spi_color_formats(struct radv_pipeline *pipeline,
if (subpass->color_attachments[i].attachment == VK_ATTACHMENT_UNUSED) {
cf = V_028714_SPI_SHADER_ZERO;
-
- if (blend->need_src_alpha & (1 << i)) {
- /* Write the alpha channel of MRT0 when alpha coverage is
- * enabled because the depth attachment needs it.
- */
- col_format |= V_028714_SPI_SHADER_32_ABGR;
- }
} else {
struct radv_render_pass_attachment *attachment = pass->attachments + subpass->color_attachments[i].attachment;
bool blend_enable =
@@ -531,6 +524,14 @@ radv_pipeline_compute_spi_color_formats(struct radv_pipeline *pipeline,
col_format |= cf << (4 * i);
}
+ if (!col_format && blend->need_src_alpha & (1 << 0)) {
+ /* When a subpass doesn't have any color attachments, write the
+ * alpha channel of MRT0 when alpha coverage is enabled because
+ * the depth attachment needs it.
+ */
+ col_format |= V_028714_SPI_SHADER_32_ABGR;
+ }
+
/* If the i-th target format is set, all previous target formats must
* be non-zero to avoid hangs.
*/