Mesa (master): Always defer memory free in swr_resource_destroy
Tim Rowley
torowley at kemper.freedesktop.org
Thu Jan 12 15:11:50 UTC 2017
Module: Mesa
Branch: master
Commit: a61528fa33f8d7f39167e62da6d9317ed84c43b8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a61528fa33f8d7f39167e62da6d9317ed84c43b8
Author: George Kyriazis <george.kyriazis at intel.com>
Date: Tue Jan 10 17:12:03 2017 -0600
Always defer memory free in swr_resource_destroy
Defer delete on regular resources. This ensures that any work being done
on the resource is completed before freeing up the resource's memory.
Reviewed-by: Bruce Cherniak <bruce.cherniak at intel.com>
---
src/gallium/drivers/swr/swr_screen.cpp | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/gallium/drivers/swr/swr_screen.cpp b/src/gallium/drivers/swr/swr_screen.cpp
index cc8030e..5012388 100644
--- a/src/gallium/drivers/swr/swr_screen.cpp
+++ b/src/gallium/drivers/swr/swr_screen.cpp
@@ -880,18 +880,11 @@ swr_resource_destroy(struct pipe_screen *p_screen, struct pipe_resource *pt)
winsys->displaytarget_destroy(winsys, spr->display_target);
} else {
- /* For regular resources, if the resource is being used, defer deletion
- * (use aligned-free) */
- if (pipe && spr->status) {
- swr_resource_unused(pt);
- swr_fence_work_free(screen->flush_fence,
- spr->swr.pBaseAddress, true);
- swr_fence_work_free(screen->flush_fence,
- spr->secondary.pBaseAddress, true);
- } else {
- AlignedFree(spr->swr.pBaseAddress);
- AlignedFree(spr->secondary.pBaseAddress);
- }
+ /* For regular resources, defer deletion */
+ swr_resource_unused(pt);
+ swr_fence_work_free(screen->flush_fence, spr->swr.pBaseAddress, true);
+ swr_fence_work_free(screen->flush_fence,
+ spr->secondary.pBaseAddress, true);
}
FREE(spr);
More information about the mesa-commit
mailing list