When the i-th target format is set, all previous target formats
must be non-zero to avoid hangs. In other words, without this
if a fragment shader exports mrt0, mrt2 and mrt3, the GPU hangs
because the target format of mrt1 is zero.
This fixes a GPU hang with "Seven: The Days Long Gone" with
DXVK. I suspect this might fix a bunch of other games.
Cc: "18.0" 18.1" <mesa-sta...@lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
src/amd/vulkan/radv_pipeline.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index ff647ed9af3..23cc782b098 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -504,6 +504,7 @@ radv_pipeline_compute_spi_color_formats(struct
radv_pipeline *pipeline,
RADV_FROM_HANDLE(radv_render_pass, pass, pCreateInfo->renderPass);
struct radv_subpass *subpass = pass->subpasses + pCreateInfo->subpass;
unsigned col_format = 0;
+ unsigned num_targets;
for (unsigned i = 0; i < (blend->single_cb_enable ? 1 :
subpass->color_count); ++i) {
unsigned cf;
@@ -528,6 +529,14 @@ radv_pipeline_compute_spi_color_formats(struct
radv_pipeline *pipeline,
if (blend->mrt0_is_dual_src)
col_format |= (col_format & 0xf) << 4;
blend->spi_shader_col_format = col_format;
+
+ /* If the i-th target format is set, all previous target formats must
+ * be non-zero to avoid hangs.
+ */
+ num_targets = (util_last_bit(blend->spi_shader_col_format) + 3) / 4;
+ for (unsigned i = 0; i < num_targets; i++)
+ if (!(blend->spi_shader_col_format & (0xf << (i * 4))))
+ blend->spi_shader_col_format |=
V_028714_SPI_SHADER_32_R << (i * 4);
}
static bool
--
2.17.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
