summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Clark <robclark@freedesktop.org>2014-09-30 13:47:58 -0400
committerEmil Velikov <emil.l.velikov@gmail.com>2014-10-29 17:44:01 +0000
commit476c8c5028bf99904356c5b827e79f187e69d962 (patch)
treed05f334d9ff3142d146fd8cd88a80d101af8ddc1 /src
parent6d5a3daca9ac19a88d30a64a7ad8957239c65ba5 (diff)
freedreno: destroy transfer pool after blitter
Blitter can still have transfers hanging around which it frees in util_blitter_destroy(). So let it clean up before we yank the transfer_pool from under it. Signed-off-by: Rob Clark <robclark@freedesktop.org> (cherry picked from commit cc355f1c06063b6d3c0ba5377aee605c9c393488)
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/freedreno/freedreno_context.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/freedreno/freedreno_context.c b/src/gallium/drivers/freedreno/freedreno_context.c
index 496a4227099..3a8545f6716 100644
--- a/src/gallium/drivers/freedreno/freedreno_context.c
+++ b/src/gallium/drivers/freedreno/freedreno_context.c
@@ -148,8 +148,6 @@ fd_context_destroy(struct pipe_context *pctx)
fd_prog_fini(pctx);
fd_hw_query_fini(pctx);
- util_slab_destroy(&ctx->transfer_pool);
-
util_dynarray_fini(&ctx->draw_patches);
if (ctx->blitter)
@@ -158,6 +156,8 @@ fd_context_destroy(struct pipe_context *pctx)
if (ctx->primconvert)
util_primconvert_destroy(ctx->primconvert);
+ util_slab_destroy(&ctx->transfer_pool);
+
fd_ringmarker_del(ctx->draw_start);
fd_ringmarker_del(ctx->draw_end);
fd_ringmarker_del(ctx->binning_start);