summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2021-05-10 16:13:01 -0400
committerEric Engestrom <eric@engestrom.ch>2021-05-31 22:48:17 +0200
commit284299176ea5a84f594e9598e3108d1e29fde06e (patch)
tree26f0e1221dae9c504595f4758affb399c49a1aa3
parent3bb1a7959854253dfdca99f48d7226675a1267b9 (diff)
aux/trace: fix set_inlinable_constants hook
need to dump the arg, not just the array Fixes: 8926c4a313e ("aux/trace: add a set_inlinable_constants hook") Reviewed-by: Adam Jackson <ajax@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10899> (cherry picked from commit dce827f69c6163c6390f3d561024356d8a50d16e)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/auxiliary/driver_trace/tr_context.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index cdc2540803b..8c33e965c61 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -382,7 +382,7 @@
"description": "aux/trace: fix set_inlinable_constants hook",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "8926c4a313e409a6098846de605f99436c0f0255"
},
diff --git a/src/gallium/auxiliary/driver_trace/tr_context.c b/src/gallium/auxiliary/driver_trace/tr_context.c
index 787db7b5f0b..1252d367b33 100644
--- a/src/gallium/auxiliary/driver_trace/tr_context.c
+++ b/src/gallium/auxiliary/driver_trace/tr_context.c
@@ -891,7 +891,7 @@ trace_context_set_inlinable_constants(struct pipe_context *_pipe, enum pipe_shad
trace_dump_arg(ptr, pipe);
trace_dump_arg(uint, shader);
trace_dump_arg(uint, num_values);
- trace_dump_array(uint, values, num_values);
+ trace_dump_arg_array(uint, values, num_values);
pipe->set_inlinable_constants(pipe, shader, num_values, values);