diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2020-11-11 09:02:31 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-12-10 23:10:11 +0000 |
| commit | 4631f3848c382f49a57154cd727eabb835529d04 (patch) | |
| tree | 8301516e80fb457e0f9abe5fc7551216fec86f31 | |
| parent | 7bf1fbea73348a16badbcc14094ac654947d176e (diff) | |
radv: do VGT_FLUSH when switching NGG -> legacy on Sienna Cichlid
Ported from RadeonSI.
Cc: 20.2
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
(cherry picked from commit 0790105f2f0d1813dc2ecaf5e12e7131730a8bc1)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8014>
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 6b02bd5f433..25718e4e6d5 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -4254,14 +4254,15 @@ void radv_CmdBindPipeline( /* Prefetch all pipeline shaders at first draw time. */ cmd_buffer->state.prefetch_L2_mask |= RADV_PREFETCH_SHADERS; - if (cmd_buffer->device->physical_device->rad_info.chip_class == GFX10 && + if ((cmd_buffer->device->physical_device->rad_info.chip_class == GFX10 || + cmd_buffer->device->physical_device->rad_info.family == CHIP_SIENNA_CICHLID) && cmd_buffer->state.emitted_pipeline && radv_pipeline_has_ngg(cmd_buffer->state.emitted_pipeline) && !radv_pipeline_has_ngg(cmd_buffer->state.pipeline)) { /* Transitioning from NGG to legacy GS requires - * VGT_FLUSH on Navi10-14. VGT_FLUSH is also emitted - * at the beginning of IBs when legacy GS ring pointers - * are set. + * VGT_FLUSH on GFX10 and Sienna Cichlid. VGT_FLUSH + * is also emitted at the beginning of IBs when legacy + * GS ring pointers are set. */ cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_VGT_FLUSH; } |