aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2017-04-16 20:09:03 +0200
committerMarek Olšák <[email protected]>2017-04-25 22:39:31 +0200
commit231dfa5a029f99d8bb2d4b0f34915bbc58458f93 (patch)
treee754bd736b395ce4f03647165b0de8158f79196a /src
parent2c1ec23a0618b93cf0f5ae29aac27bb2c4a5e18c (diff)
trace: don't trace resource_destroy
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 <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/trace/tr_screen.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gallium/drivers/trace/tr_screen.c b/src/gallium/drivers/trace/tr_screen.c
index 0fa8d0f449f..e56434c5bda 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);
}