Mesa (staging/22.0): zink: support restart with PIPE_PRIM_LINES_ADJACENCY if ext is available

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 75e04e790732ccd0d20eac83f066844caa0e7d6a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=75e04e790732ccd0d20eac83f066844caa0e7d6a

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Apr 15 12:57:25 2022 -0400

zink: support restart with PIPE_PRIM_LINES_ADJACENCY if ext is available

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15978>
(cherry picked from commit cd9424d93f3da62397c0cdaf70076512e217b464)

---

 .pick_status.json                      | 2 +-
 src/gallium/drivers/zink/zink_screen.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 93c780bd024..41e1b31a9ec 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1364,7 +1364,7 @@
         "description": "zink: support restart with PIPE_PRIM_LINES_ADJACENCY if ext is available",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": null
     },
     {
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 53827772f22..420869e17c9 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -338,6 +338,7 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
       if (screen->info.have_EXT_primitive_topology_list_restart) {
          modes |= BITFIELD_BIT(PIPE_PRIM_POINTS) |
                   BITFIELD_BIT(PIPE_PRIM_LINES) |
+                  BITFIELD_BIT(PIPE_PRIM_LINES_ADJACENCY) |
                   BITFIELD_BIT(PIPE_PRIM_TRIANGLES) |
                   BITFIELD_BIT(PIPE_PRIM_TRIANGLES_ADJACENCY);
          if (screen->info.list_restart_feats.primitiveTopologyPatchListRestart)