From 231dfa5a029f99d8bb2d4b0f34915bbc58458f93 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 16 Apr 2017 20:09:03 +0200 Subject: [PATCH] trace: don't trace resource_destroy MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit due to the lack of pipe_resource wrapping, we can get this call from inside of driver calls, which would try to lock an already-locked mutex. Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/trace/tr_screen.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/trace/tr_screen.c b/src/gallium/drivers/trace/tr_screen.c index 0fa8d0f..e56434c 100644 --- a/src/gallium/drivers/trace/tr_screen.c +++ b/src/gallium/drivers/trace/tr_screen.c @@ -391,13 +391,10 @@ trace_screen_resource_destroy(struct pipe_screen *_screen, struct trace_screen *tr_scr = trace_screen(_screen); struct pipe_screen *screen = tr_scr->screen; - trace_dump_call_begin("pipe_screen", "resource_destroy"); - - trace_dump_arg(ptr, screen); - trace_dump_arg(ptr, resource); - - trace_dump_call_end(); - + /* Don't trace this, because due to the lack of pipe_resource wrapping, + * we can get this call from inside of driver calls, which would try + * to lock an already-locked mutex. + */ screen->resource_destroy(screen, resource); } -- 2.7.4