KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aux/trace: fix query handling with tc 

trace needs to follow the tc rules for queries a little in order to avoid
crashing and provide drivers with the same behavior they expect

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10899>
This commit is contained in:
Mike Blumenkrantz 2021-05-17 14:01:49 -04:00 committed by Marge Bot
parent dce827f69c
commit 33e7001572
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/auxiliary/driver_trace/tr_context.c
View File

@ -45,6 +45,7 @@
struct trace_query
{
struct threaded_query base;
unsigned type;
struct pipe_query *query;
@ -224,19 +225,21 @@ trace_context_begin_query(struct pipe_context *_pipe,
static bool
trace_context_end_query(struct pipe_context *_pipe,
struct pipe_query *query)
struct pipe_query *_query)
{
struct trace_context *tr_ctx = trace_context(_pipe);
struct pipe_context *pipe = tr_ctx->pipe;
bool ret;
query = trace_query_unwrap(query);
struct pipe_query *query = trace_query_unwrap(_query);
trace_dump_call_begin("pipe_context", "end_query");
trace_dump_arg(ptr, pipe);
trace_dump_arg(ptr, query);
if (tr_ctx->threaded)
threaded_query(query)->flushed = trace_query(_query)->base.flushed;
ret = pipe->end_query(pipe, query);
trace_dump_call_end();
@ -261,6 +264,9 @@ trace_context_get_query_result(struct pipe_context *_pipe,
trace_dump_arg(ptr, pipe);
trace_dump_arg(ptr, query);
if (tr_ctx->threaded)
threaded_query(query)->flushed = trace_query(_query)->base.flushed;
ret = pipe->get_query_result(pipe, query, wait, result);
trace_dump_arg_begin("result");