Mesa (staging/20.3): turnip: use ir3_compiler_destroy instead of ralloc_free

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Dec 23 18:51:54 UTC 2020


Module: Mesa
Branch: staging/20.3
Commit: b41a3c8a1d4eff2354efb148c9594829bc38b643
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b41a3c8a1d4eff2354efb148c9594829bc38b643

Author: Hyunjun Ko <zzoon at igalia.com>
Date:   Thu Nov 19 01:36:13 2020 +0000

turnip: use ir3_compiler_destroy instead of ralloc_free

Fixes: c0f22c3d9406ef3 "freedreno/ir3: add ir3_compiler_destroy()"

Signed-off-by: Hyunjun Ko <zzoon at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6808>
(cherry picked from commit ec1464077bb0cfad1e0a5181a976fbb8ba8015a4)

---

 .pick_status.json                | 2 +-
 src/freedreno/vulkan/tu_device.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 7d18a1f6784..1584bd477e5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -814,7 +814,7 @@
         "description": "turnip: use ir3_compiler_destroy instead of ralloc_free",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "c0f22c3d9406ef354142e974783f6c6c066a5c68"
     },
diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c
index bb7f06f070f..267f07b0e7e 100644
--- a/src/freedreno/vulkan/tu_device.c
+++ b/src/freedreno/vulkan/tu_device.c
@@ -1137,7 +1137,7 @@ fail_global_bo_map:
    tu_bo_finish(device, &device->global_bo);
 
 fail_global_bo:
-   ralloc_free(device->compiler);
+   ir3_compiler_destroy(device->compiler);
 
 fail_queues:
    for (unsigned i = 0; i < TU_MAX_QUEUE_FAMILIES; i++) {



More information about the mesa-commit mailing list