Mesa (main): tu: Delete unused tu_clear_blit GS handling

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri May 13 17:52:17 UTC 2022


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

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Mon Jan 31 16:51:24 2022 +0100

tu: Delete unused tu_clear_blit GS handling

This has been unused for a while since we switched to writing the
array index in the VS.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16147>

---

 src/freedreno/vulkan/tu_pipeline.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index 441ed0285fb..abe232e56f7 100644
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -1252,25 +1252,17 @@ tu6_emit_vpc(struct tu_cs *cs,
       uint32_t vertices_out, invocations, output, vec4_size;
       uint32_t prev_stage_output_size = ds ? ds->output_size : vs->output_size;
 
-      /* this detects the tu_clear_blit path, which doesn't set ->nir */
-      if (gs->shader->nir) {
-         if (hs) {
-            tu6_emit_link_map(cs, ds, gs, SB6_GS_SHADER);
-         } else {
-            tu6_emit_link_map(cs, vs, gs, SB6_GS_SHADER);
-         }
-         vertices_out = gs->shader->nir->info.gs.vertices_out - 1;
-         output = primitive_to_tess(gs->shader->nir->info.gs.output_primitive);
-         invocations = gs->shader->nir->info.gs.invocations - 1;
-         /* Size of per-primitive alloction in ldlw memory in vec4s. */
-         vec4_size = gs->shader->nir->info.gs.vertices_in *
-                     DIV_ROUND_UP(prev_stage_output_size, 4);
+      if (hs) {
+         tu6_emit_link_map(cs, ds, gs, SB6_GS_SHADER);
       } else {
-         vertices_out = 3;
-         output = TESS_CW_TRIS;
-         invocations = 0;
-         vec4_size = 0;
+         tu6_emit_link_map(cs, vs, gs, SB6_GS_SHADER);
       }
+      vertices_out = gs->shader->nir->info.gs.vertices_out - 1;
+      output = primitive_to_tess(gs->shader->nir->info.gs.output_primitive);
+      invocations = gs->shader->nir->info.gs.invocations - 1;
+      /* Size of per-primitive alloction in ldlw memory in vec4s. */
+      vec4_size = gs->shader->nir->info.gs.vertices_in *
+                  DIV_ROUND_UP(prev_stage_output_size, 4);
 
       tu_cs_emit_pkt4(cs, REG_A6XX_PC_PRIMITIVE_CNTL_5, 1);
       tu_cs_emit(cs,



More information about the mesa-commit mailing list