diff options
| author | Samuel Pitoiset <[email protected]> | 2018-06-01 16:22:32 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2018-06-04 14:01:33 +0200 |
| commit | 06d3c65098097675a34035da3043a71061fad17b (patch) | |
| tree | adbcbfd46a61ceced4d32d9b4804017b3f70c6d6 /src/amd/vulkan/radv_pipeline.c | |
| parent | 2835b6baf446d0ff3b3df6eefc57b248a505af36 (diff) | |
radv: fix a GPU hang when MRTs are sparse
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 DXVK GPU hangs with "Seven: The Days Long Gone",
"GTA V" and probably more games.
Cc: "18.0" 18.1" <[email protected]>
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src/amd/vulkan/radv_pipeline.c')
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 375f7c357d3..b8b425aca9f 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,15 @@ 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 |