Mesa (master): d3d12: remove hand-written intrinsic builders

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 67ba666a454a8856ca1ca7813da5c5b7308cb136
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=67ba666a454a8856ca1ca7813da5c5b7308cb136

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Fri Nov 27 10:13:49 2020 +0000

d3d12: remove hand-written intrinsic builders

These are no longer necessary and break the build.

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Fixes: c9bcad25737 ("nir: add generated intrinsic builders")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7808>

---

 src/gallium/drivers/d3d12/d3d12_gs_variant.cpp | 26 +++-----------------------
 src/gallium/drivers/d3d12/d3d12_nir_passes.c   | 10 ----------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_gs_variant.cpp b/src/gallium/drivers/d3d12/d3d12_gs_variant.cpp
index 8522201438a..eb139d95be5 100644
--- a/src/gallium/drivers/d3d12/d3d12_gs_variant.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_gs_variant.cpp
@@ -34,26 +34,6 @@
 #include "util/u_memory.h"
 #include "util/u_simple_shaders.h"
 
-static void
-nir_emit_vertex(nir_builder *b, unsigned stream_id)
-{
-   nir_intrinsic_instr *instr;
-
-   instr = nir_intrinsic_instr_create(b->shader, nir_intrinsic_emit_vertex);
-   nir_intrinsic_set_stream_id(instr, stream_id);
-   nir_builder_instr_insert(b, &instr->instr);
-}
-
-static void
-nir_end_primitve(nir_builder *b, unsigned stream_id)
-{
-   nir_intrinsic_instr *instr;
-
-   instr = nir_intrinsic_instr_create(b->shader, nir_intrinsic_end_primitive);
-   nir_intrinsic_set_stream_id(instr, 0);
-   nir_builder_instr_insert(b, &instr->instr);
-}
-
 static nir_ssa_def *
 nir_cull_face(nir_builder *b, nir_variable *vertices, bool ccw)
 {
@@ -126,7 +106,7 @@ d3d12_make_passthrough_gs(struct d3d12_context *ctx, struct d3d12_gs_variant_key
    }
 
    nir_emit_vertex(&b, 0);
-   nir_end_primitve(&b, 0);
+   nir_end_primitive(&b, 0);
 
    NIR_PASS_V(nir, nir_lower_var_copies);
    nir_validate_shader(nir, "in d3d12_create_passthrough_gs");
@@ -314,7 +294,7 @@ d3d12_finish_emit_primitives_gs(struct emit_primitives_context *emit_ctx, bool e
    nir_pop_loop(b, emit_ctx->loop);
 
    if (end_primitive)
-      nir_end_primitve(b, 0);
+      nir_end_primitive(b, 0);
 
    nir_validate_shader(nir, "in d3d12_lower_edge_flags");
 
@@ -403,7 +383,7 @@ d3d12_emit_lines(struct d3d12_context *ctx, struct d3d12_gs_variant_key *key)
        nir_store_var(b, emit_ctx.front_facing_var, emit_ctx.front_facing, 0x1);
    nir_emit_vertex(b, 0);
 
-   nir_end_primitve(b, 0);
+   nir_end_primitive(b, 0);
 
    return d3d12_finish_emit_primitives_gs(&emit_ctx, false);
 }
diff --git a/src/gallium/drivers/d3d12/d3d12_nir_passes.c b/src/gallium/drivers/d3d12/d3d12_nir_passes.c
index f58cf2434ee..99bdbaaf509 100644
--- a/src/gallium/drivers/d3d12/d3d12_nir_passes.c
+++ b/src/gallium/drivers/d3d12/d3d12_nir_passes.c
@@ -865,16 +865,6 @@ lower_triangle_strip_store(nir_builder *b, nir_intrinsic_instr *intr,
    nir_instr_remove(&intr->instr);
 }
 
-static void
-nir_emit_vertex(nir_builder *b, unsigned stream_id)
-{
-   nir_intrinsic_instr *instr;
-
-   instr = nir_intrinsic_instr_create(b->shader, nir_intrinsic_emit_vertex);
-   nir_intrinsic_set_stream_id(instr, stream_id);
-   nir_builder_instr_insert(b, &instr->instr);
-}
-
 static void
 lower_triangle_strip_emit_vertex(nir_builder *b, nir_intrinsic_instr *intr,
                                  nir_variable *vertex_count_var,