Mesa (staging/20.0): llvmpipo/nir: free compute shader NIR
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu May 7 02:29:41 UTC 2020
Module: Mesa
Branch: staging/20.0
Commit: 640f810f956bb962f82b8f062a94452fe795327f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=640f810f956bb962f82b8f062a94452fe795327f
Author: Dave Airlie <airlied at redhat.com>
Date: Tue May 5 16:03:34 2020 +1000
llvmpipo/nir: free compute shader NIR
I forgot this in the last round.
Fixes: 18f896e55d96 (llvmpipe: add initial nir support)
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4899>
(cherry picked from commit 870b6a60509e2dd547dc75fee9290224ad306779)
---
.pick_status.json | 2 +-
src/gallium/drivers/llvmpipe/lp_state_cs.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.pick_status.json b/.pick_status.json
index db3f3ba7272..017eaa61466 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -769,7 +769,7 @@
"description": "llvmpipo/nir: free compute shader NIR",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "18f896e55d96c63b11de7ed0cbe484988a1184c5"
},
diff --git a/src/gallium/drivers/llvmpipe/lp_state_cs.c b/src/gallium/drivers/llvmpipe/lp_state_cs.c
index b57e1068a06..ff767a2a860 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_cs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_cs.c
@@ -523,6 +523,8 @@ llvmpipe_delete_compute_state(struct pipe_context *pipe,
llvmpipe_remove_cs_shader_variant(llvmpipe, li->base);
li = next;
}
+ if (shader->base.ir.nir)
+ ralloc_free(shader->base.ir.nir);
tgsi_free_tokens(shader->base.tokens);
FREE(shader);
}
More information about the mesa-commit
mailing list