From: George Kyriazis <george.kyriazis@intel.com>
Date: Tue, 10 Jan 2017 23:12:03 +0000 (-0600)
Subject: Always defer memory free in swr_resource_destroy
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a61528fa33f8d7f39167e62da6d9317ed84c43b8;p=mesa.git

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@intel.com>
---

diff --git a/src/gallium/drivers/swr/swr_screen.cpp b/src/gallium/drivers/swr/swr_screen.cpp
index cc8030eaff6..50123887b50 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);