Mesa (staging/22.0): Revert "draw: fix gs vertex stream counting"

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: bac8e198fb3b8d96096c2d77df828ab1e79a9d59
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bac8e198fb3b8d96096c2d77df828ab1e79a9d59

Author: Dylan Baker <dylan.c.baker at intel.com>
Date:   Thu Mar 31 20:47:14 2022 -0700

Revert "draw: fix gs vertex stream counting"

This reverts commit 44b50c2e3918e623051c12aadbcc8d3702726559.

---

 .pick_status.json                    |  2 +-
 src/gallium/auxiliary/draw/draw_gs.c | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 8346e50922e..684bbcd07f6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2260,7 +2260,7 @@
         "description": "draw: fix gs vertex stream counting",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 1,
+        "resolution": 0,
         "because_sha": null
     },
     {
diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c
index 571709fd1b9..90e66b6436e 100644
--- a/src/gallium/auxiliary/draw/draw_gs.c
+++ b/src/gallium/auxiliary/draw/draw_gs.c
@@ -36,7 +36,6 @@
 #include "tgsi/tgsi_parse.h"
 #include "tgsi/tgsi_exec.h"
 #include "nir/nir_to_tgsi_info.h"
-#include "compiler/nir/nir.h"
 #include "pipe/p_shader_tokens.h"
 
 #include "util/u_math.h"
@@ -793,16 +792,8 @@ draw_create_geometry_shader(struct draw_context *draw,
       }
 
       tgsi_scan_shader(state->tokens, &gs->info);
-      gs->num_vertex_streams = 1;
-      for (i = 0; i < gs->state.stream_output.num_outputs; i++) {
-         if (gs->state.stream_output.output[i].stream >= gs->num_vertex_streams)
-            gs->num_vertex_streams = gs->state.stream_output.output[i].stream + 1;
-      }
-   } else {
+   } else
       nir_tgsi_scan_shader(state->ir.nir, &gs->info, true);
-      nir_shader *nir = state->ir.nir;
-      gs->num_vertex_streams = util_last_bit(nir->info.gs.active_stream_mask);
-   }
 
    /* setup the defaults */
    gs->max_out_prims = 0;
@@ -867,6 +858,12 @@ draw_create_geometry_shader(struct draw_context *draw,
 
    gs->machine = draw->gs.tgsi.machine;
 
+   gs->num_vertex_streams = 1;
+   for (i = 0; i < gs->state.stream_output.num_outputs; i++) {
+      if (gs->state.stream_output.output[i].stream >= gs->num_vertex_streams)
+         gs->num_vertex_streams = gs->state.stream_output.output[i].stream + 1;
+   }
+
 #ifdef DRAW_LLVM_AVAILABLE
    if (use_llvm) {
       int vector_size = gs->vector_length * sizeof(float);