Mesa (main): zink: remove primconvert

[GitLab Mirror]

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

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

zink: remove primconvert

this is no longer used

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

---

 src/gallium/drivers/zink/zink_context.c | 14 --------------
 src/gallium/drivers/zink/zink_context.h |  3 ---
 src/gallium/drivers/zink/zink_draw.c    |  1 -
 3 files changed, 18 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 836794724c3..36498af54f6 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -37,7 +37,6 @@
 #include "zink_state.h"
 #include "zink_surface.h"
 
-#include "indices/u_primconvert.h"
 #include "util/u_blitter.h"
 #include "util/u_debug.h"
 #include "util/format_srgb.h"
@@ -114,7 +113,6 @@ zink_context_destroy(struct pipe_context *pctx)
    hash_table_foreach(ctx->render_pass_cache, he)
       zink_destroy_render_pass(screen, he->data);
 
-   util_primconvert_destroy(ctx->primconvert);
    u_upload_destroy(pctx->stream_uploader);
    u_upload_destroy(pctx->const_uploader);
    slab_destroy_child(&ctx->transfer_pool);
@@ -3440,18 +3438,6 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
    for (int i = 0; i < ARRAY_SIZE(ctx->fb_clears); i++)
       util_dynarray_init(&ctx->fb_clears[i].clears, ctx);
 
-   int prim_hwsupport = 1 << PIPE_PRIM_POINTS |
-                        1 << PIPE_PRIM_LINES |
-                        1 << PIPE_PRIM_LINE_STRIP |
-                        1 << PIPE_PRIM_TRIANGLES |
-                        1 << PIPE_PRIM_TRIANGLE_STRIP;
-   if (screen->have_triangle_fans)
-      prim_hwsupport |= 1 << PIPE_PRIM_TRIANGLE_FAN;
-
-   ctx->primconvert = util_primconvert_create(&ctx->base, prim_hwsupport);
-   if (!ctx->primconvert)
-      goto fail;
-
    ctx->blitter = util_blitter_create(&ctx->base);
    if (!ctx->blitter)
       goto fail;
diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h
index 7ef543f8c43..f23419c6ae2 100644
--- a/src/gallium/drivers/zink/zink_context.h
+++ b/src/gallium/drivers/zink/zink_context.h
@@ -47,7 +47,6 @@
 #include <vulkan/vulkan.h>
 
 struct blitter_context;
-struct primconvert_context;
 struct list_head;
 
 struct zink_blend_state;
@@ -195,8 +194,6 @@ struct zink_context {
    bool fb_changed;
    bool rp_changed;
 
-   struct primconvert_context *primconvert;
-
    struct zink_framebuffer *framebuffer;
    struct zink_framebuffer_clear fb_clears[PIPE_MAX_COLOR_BUFS + 1];
    uint16_t clears_enabled;
diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c
index 6e09e9d8ea1..4db1930825b 100644
--- a/src/gallium/drivers/zink/zink_draw.c
+++ b/src/gallium/drivers/zink/zink_draw.c
@@ -7,7 +7,6 @@
 #include "zink_state.h"
 #include "zink_surface.h"
 
-#include "indices/u_primconvert.h"
 #include "tgsi/tgsi_from_mesa.h"
 #include "util/hash_table.h"
 #include "util/u_debug.h"