Mesa (staging/21.3): aux/trace: fix vertex state tracing

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 7c30e502050489920e6d705773119a094ceb455e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c30e502050489920e6d705773119a094ceb455e

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

aux/trace: fix vertex state tracing

Fixes: e8cad57aa7a ("gallium/trace: add pipe_vertex_state support")

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13582>
(cherry picked from commit f57940109998ac92656e7d5509516a44b21b08fc)

---

 .pick_status.json                              | 2 +-
 src/gallium/auxiliary/driver_trace/tr_screen.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 7efaa4a4fba..e675184b4b4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -13,7 +13,7 @@
         "description": "aux/trace: fix vertex state tracing",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "e8cad57aa7ab0b7cc1e86e85915b6ad413cdd865"
     },
diff --git a/src/gallium/auxiliary/driver_trace/tr_screen.c b/src/gallium/auxiliary/driver_trace/tr_screen.c
index 81eaff92f3e..32f0bba7c94 100644
--- a/src/gallium/auxiliary/driver_trace/tr_screen.c
+++ b/src/gallium/auxiliary/driver_trace/tr_screen.c
@@ -1055,7 +1055,9 @@ trace_screen_create_vertex_state(struct pipe_screen *_screen,
    trace_dump_arg(ptr, screen);
    trace_dump_arg(ptr, buffer->buffer.resource);
    trace_dump_arg(vertex_buffer, buffer);
+   trace_dump_arg_begin("elements");
    trace_dump_struct_array(vertex_element, elements, num_elements);
+   trace_dump_arg_end();
    trace_dump_arg(uint, num_elements);
    trace_dump_arg(ptr, indexbuf);
    trace_dump_arg(uint, full_velem_mask);