Mesa (main): aux/primconvert: support pipe_context::draw_vertex_state

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Nov  5 11:56:56 2021 -0400

aux/primconvert: support pipe_context::draw_vertex_state

Reviewed-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13742>

---

 src/gallium/auxiliary/indices/u_primconvert.c | 51 +++++++++++++++++++++++++++
 src/gallium/auxiliary/indices/u_primconvert.h |  7 ++++
 2 files changed, 58 insertions(+)

diff --git a/src/gallium/auxiliary/indices/u_primconvert.c b/src/gallium/auxiliary/indices/u_primconvert.c
index 30da20ddb63..c4fc9cd9f88 100644
--- a/src/gallium/auxiliary/indices/u_primconvert.c
+++ b/src/gallium/auxiliary/indices/u_primconvert.c
@@ -306,3 +306,54 @@ util_primconvert_draw_vbo(struct primconvert_context *pc,
 
    pipe_resource_reference(&new_info.index.resource, NULL);
 }
+
+void
+util_primconvert_draw_vertex_state(struct primconvert_context *pc,
+                                   struct pipe_vertex_state *vstate,
+                                   uint32_t partial_velem_mask,
+                                   struct pipe_draw_vertex_state_info info,
+                                   const struct pipe_draw_start_count_bias *draws,
+                                   unsigned num_draws)
+{
+   struct pipe_draw_info new_info;
+   struct pipe_draw_start_count_bias new_draw;
+
+   if (pc->cfg.primtypes_mask & BITFIELD_BIT(info.mode)) {
+      pc->pipe->draw_vertex_state(pc->pipe, vstate, partial_velem_mask, info, draws, num_draws);
+      return;
+   }
+
+   if (num_draws > 1) {
+      for (unsigned i = 0; i < num_draws; i++) {
+         if (draws[i].count)
+            util_primconvert_draw_vertex_state(pc, vstate, partial_velem_mask, info, &draws[i], 1);
+      }
+      return;
+   }
+
+   struct pipe_draw_info dinfo = {0};
+   dinfo.mode = info.mode;
+   dinfo.index_size = 4;
+   dinfo.instance_count = 1;
+   dinfo.index.resource = vstate->input.indexbuf;
+   if (!primconvert_init_draw(pc, &dinfo, NULL, draws, &new_info, &new_draw))
+      return;
+
+   struct pipe_vertex_state *new_state = pc->pipe->screen->create_vertex_state(pc->pipe->screen,
+                                                                               &vstate->input.vbuffer,
+                                                                               vstate->input.elements,
+                                                                               vstate->input.num_elements,
+                                                                               new_info.index.resource,
+                                                                               vstate->input.full_velem_mask);
+   if (new_state) {
+      struct pipe_draw_vertex_state_info new_vinfo;
+      new_vinfo.mode = new_info.mode;
+      new_vinfo.take_vertex_state_ownership = true;
+      /* to the translated draw: */
+      pc->pipe->draw_vertex_state(pc->pipe, new_state, partial_velem_mask, new_vinfo, &new_draw, 1);
+   }
+   if (info.take_vertex_state_ownership)
+      pipe_vertex_state_reference(&vstate, NULL);
+
+   pipe_resource_reference(&new_info.index.resource, NULL);
+}
diff --git a/src/gallium/auxiliary/indices/u_primconvert.h b/src/gallium/auxiliary/indices/u_primconvert.h
index 0dfd5f83c67..9d90b9cddbb 100644
--- a/src/gallium/auxiliary/indices/u_primconvert.h
+++ b/src/gallium/auxiliary/indices/u_primconvert.h
@@ -58,6 +58,13 @@ void util_primconvert_draw_vbo(struct primconvert_context *pc,
                                const struct pipe_draw_indirect_info *indirect,
                                const struct pipe_draw_start_count_bias *draws,
                                unsigned num_draws);
+void
+util_primconvert_draw_vertex_state(struct primconvert_context *pc,
+                                   struct pipe_vertex_state *state,
+                                   uint32_t partial_velem_mask,
+                                   struct pipe_draw_vertex_state_info info,
+                                   const struct pipe_draw_start_count_bias *draws,
+                                   unsigned num_draws);
 
 #ifdef __cplusplus
 }