From 57a3f0f9499c253a4a4e515ecda7e4c0f8163bf5 Mon Sep 17 00:00:00 2001
From: Danylo Piliaiev <dpiliaiev@igalia.com>
Date: Wed, 15 May 2024 12:21:23 +0200
Subject: [PATCH] util/u_trace: Allow mixing of ArgStruct and Arg

Would allow to define such arguments:

    args=[ArgStruct(type='const struct tu_framebuffer *', var='fb'),
          ArgStruct(type='const struct tu_tiling_config *', var='tiling'),
          Arg(type='uint8_t',  var='maxSamples',  c_format='%u'),
          Arg(type='uint8_t',  var='clearCPP',    c_format='%u'),
          Arg(type='uint8_t',  var='loadCPP',     c_format='%u'),
          Arg(type='uint8_t',  var='storeCPP',    c_format='%u'),],

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Reviewed-by: Karmjit Mahil <karmjit.mahil@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29222>
---
 src/util/perf/u_trace.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/util/perf/u_trace.py b/src/util/perf/u_trace.py
index 1035b9c4cf9..b474f05dabe 100644
--- a/src/util/perf/u_trace.py
+++ b/src/util/perf/u_trace.py
@@ -60,6 +60,9 @@ class Tracepoint(object):
         self.args = args
         if tp_struct is None:
            tp_struct = args
+        else:
+           tp_struct += [x for x in args if isinstance(x, TracepointArg)]
+
         self.tp_struct = tp_struct
         self.has_variable_arg = False
         for arg in self.tp_struct: