Mesa (staging/22.1): anv: Fix geometry flickering issue when compute and 3D passes are combined

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 692d9bce640626e400419b2b5879257c86efcfee
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=692d9bce640626e400419b2b5879257c86efcfee

Author: Vadym Shovkoplias <vadym.shovkoplias at globallogic.com>
Date:   Thu Apr 14 21:52:47 2022 +0300

anv: Fix geometry flickering issue when compute and 3D passes are combined

Call flush_pipeline_select_3d in CmdBeginRendering() to emit a dummy MEDIA_VFE_STATE
before switching from GPGPU to 3D.

Original commit with the fix:
bc612536 ("anv: Emit a dummy MEDIA_VFE_STATE before switching from GPGPU to 3D")

Fixes: 3501a3f9ed92 ("anv: Convert to 100% dynamic rendering")
Signed-off-by: Vadym Shovkoplias <vadym.shovkoplias at globallogic.com>
Gitlab: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6201
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15954>
(cherry picked from commit 785b6579ae55e1320aa331de945366e18f41bf12)

---

 .pick_status.json                  | 2 +-
 src/intel/vulkan/genX_cmd_buffer.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index ee6b3b44abd..1945c60f75f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -202,7 +202,7 @@
         "description": "anv: Fix geometry flickering issue when compute and 3D passes are combined",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "3501a3f9ed92831ed039f0d54bf295af41ed0195"
     },
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 0379ba8ad0c..0f3caa24f6d 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -6530,6 +6530,8 @@ void genX(CmdBeginRendering)(
    if (result != VK_SUCCESS)
       return;
 
+   genX(flush_pipeline_select_3d)(cmd_buffer);
+
    for (uint32_t i = 0; i < gfx->color_att_count; i++) {
       if (!(color_att_valid & BITFIELD_BIT(i)))
          continue;