diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-04-15 10:43:52 +1000 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-04-20 09:39:36 -0700 |
| commit | b1f087965f1474ace1822eac3f10c4d165025bb9 (patch) | |
| tree | d16eda2a3c70246c591b7cc585b85ae9d54dc8dc | |
| parent | 01844f40af559a620e1d24b79d1cf10ebbb0c05d (diff) | |
draw: free the NIR IR.
Not sure how I missed this, the ownership was a bit blurry,
free the NIR.
Fixes: bf12bc2dd7a2 (draw: add nir info gathering and building support)
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4563>
(cherry picked from commit f01c0565bb9ad7335395920aebc7489cb76d1b72)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_gs.c | 5 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_vs_llvm.c | 10 |
3 files changed, 12 insertions, 5 deletions
diff --git a/.pick_status.json b/.pick_status.json index 614bbdb2bbd..8b5b78d2c71 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2173,7 +2173,7 @@ "description": "draw: free the NIR IR.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "bf12bc2dd7a28844103bb30a07be0440e60c5864" }, diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c index 2d0a4773cbc..e2ffa1bddc8 100644 --- a/src/gallium/auxiliary/draw/draw_gs.c +++ b/src/gallium/auxiliary/draw/draw_gs.c @@ -41,7 +41,7 @@ #include "util/u_math.h" #include "util/u_memory.h" #include "util/u_prim.h" - +#include "util/ralloc.h" /* fixme: move it from here */ #define MAX_PRIMITIVES 64 @@ -956,6 +956,9 @@ void draw_delete_geometry_shader(struct draw_context *draw, for (i = 0; i < TGSI_MAX_VERTEX_STREAMS; i++) FREE(dgs->stream[i].primitive_lengths); + + if (dgs->state.ir.nir) + ralloc_free(dgs->state.ir.nir); FREE((void*) dgs->state.tokens); FREE(dgs); } diff --git a/src/gallium/auxiliary/draw/draw_vs_llvm.c b/src/gallium/auxiliary/draw/draw_vs_llvm.c index e45fa68d5d6..ec3c5b00fbc 100644 --- a/src/gallium/auxiliary/draw/draw_vs_llvm.c +++ b/src/gallium/auxiliary/draw/draw_vs_llvm.c @@ -38,6 +38,8 @@ #include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_scan.h" #include "nir/nir_to_tgsi_info.h" +#include "nir.h" + static void vs_llvm_prepare(struct draw_vertex_shader *shader, struct draw_context *draw) @@ -76,6 +78,8 @@ vs_llvm_delete( struct draw_vertex_shader *dvs ) } assert(shader->variants_cached == 0); + if (dvs->state.ir.nir) + ralloc_free(dvs->state.ir.nir); FREE((void*) dvs->state.tokens); FREE( dvs ); } @@ -92,9 +96,10 @@ draw_create_vs_llvm(struct draw_context *draw, /* due to some bugs in the feedback state tracker we have to check for ir.nir & PIPE_SHADER_IR_NIR here. */ - if (state->ir.nir && state->type == PIPE_SHADER_IR_NIR) + if (state->ir.nir && state->type == PIPE_SHADER_IR_NIR) { + vs->base.state.ir.nir = state->ir.nir; nir_tgsi_scan_shader(state->ir.nir, &vs->base.info, true); - else { + } else { /* we make a private copy of the tokens */ vs->base.state.tokens = tgsi_dup_tokens(state->tokens); if (!vs->base.state.tokens) { @@ -113,7 +118,6 @@ draw_create_vs_llvm(struct draw_context *draw, vs->base.info.file_max[TGSI_FILE_IMAGE]+1); vs->base.state.type = state->type; - vs->base.state.ir.nir = state->ir.nir; vs->base.state.stream_output = state->stream_output; vs->base.draw = draw; vs->base.prepare = vs_llvm_prepare; |