Mesa (staging/22.0): Revert "draw: fix nonzero stream primitives generated queries"

[GitLab Mirror]

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

Author: Dylan Baker <dylan.c.baker at intel.com>
Date:   Thu Mar 31 19:56:42 2022 -0700

Revert "draw: fix nonzero stream primitives generated queries"

This reverts commit 7534c0ba733bfe08cdb35a31b7b58df332a0dddc.

---

 src/gallium/auxiliary/draw/draw_pt_so_emit.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/draw/draw_pt_so_emit.c b/src/gallium/auxiliary/draw/draw_pt_so_emit.c
index f6408fe50c6..83f4a31a6ae 100644
--- a/src/gallium/auxiliary/draw/draw_pt_so_emit.c
+++ b/src/gallium/auxiliary/draw/draw_pt_so_emit.c
@@ -277,7 +277,7 @@ void draw_pt_so_emit( struct pt_so_emit *emit,
    struct vbuf_render *render = draw->render;
    unsigned start, i, stream;
 
-   if (!emit->has_so && num_vertex_streams == 1) {
+   if (!emit->has_so) {
       if (draw->collect_primgen) {
          unsigned i;
          unsigned total = 0;
@@ -292,7 +292,7 @@ void draw_pt_so_emit( struct pt_so_emit *emit,
       return;
    }
 
-   if (!emit->has_so && !draw->collect_primgen)
+   if (!draw->so.num_targets)
       return;
 
    /* XXX: need to flush to get prim_vbuf.c to release its allocation??*/
@@ -322,7 +322,7 @@ void draw_pt_so_emit( struct pt_so_emit *emit,
       }
       render->set_stream_output_info(render,
                                      stream,
-                                     emit->has_so ? emit->emitted_primitives : 0,
+                                     emit->emitted_primitives,
                                      emit->generated_primitives);
    }
 }