Mesa (main): zink: export PIPE_CAP_EMULATE_NONFIXED_PRIMITIVE_RESTART

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 09c28a35a5a392587b32d4ffaf1bcc8980c7ff07
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=09c28a35a5a392587b32d4ffaf1bcc8980c7ff07

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May 21 07:31:49 2021 -0400

zink: export PIPE_CAP_EMULATE_NONFIXED_PRIMITIVE_RESTART

gallium will now handle unsupported restart index rewriting, so
this codepath can be removed

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10973>

---

 src/gallium/drivers/zink/zink_draw.c   | 4 +---
 src/gallium/drivers/zink/zink_screen.c | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c
index 4b55e926fd6..dcdeb29922f 100644
--- a/src/gallium/drivers/zink/zink_draw.c
+++ b/src/gallium/drivers/zink/zink_draw.c
@@ -478,9 +478,7 @@ zink_draw_vbo(struct pipe_context *pctx,
    unsigned index_offset = 0;
    struct pipe_resource *index_buffer = NULL;
    if (dinfo->index_size > 0) {
-       uint32_t restart_index = util_prim_restart_index_from_size(dinfo->index_size);
-       if ((dinfo->primitive_restart && (dinfo->restart_index != restart_index)) ||
-           (!screen->info.have_EXT_index_type_uint8 && dinfo->index_size == 1)) {
+       if (!screen->info.have_EXT_index_type_uint8 && dinfo->index_size == 1) {
           util_translate_prim_restart_ib(pctx, dinfo, dindirect, &draws[0], &index_buffer);
           need_index_buffer_unref = true;
        } else {
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 1f8b03ff381..ad6c9694556 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -241,6 +241,8 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
    switch (param) {
    case PIPE_CAP_ANISOTROPIC_FILTER:
       return screen->info.feats.features.samplerAnisotropy;
+   case PIPE_CAP_EMULATE_NONFIXED_PRIMITIVE_RESTART:
+      return 1;
 
    case PIPE_CAP_QUERY_MEMORY_INFO:
    case PIPE_CAP_NPOT_TEXTURES: