KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

draw: free the NIR IR. 

Not sure how I missed this, the ownership was a bit blurry,
free the NIR.

Fixes: bf12bc2dd7 (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>
This commit is contained in:
Dave Airlie 2020-04-15 10:43:52 +10:00
parent 13ce637f1b
commit f01c0565bb
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gallium/auxiliary/draw/draw_gs.c
View File

@ -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
@ -962,6 +962,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);
}

10
src/gallium/auxiliary/draw/draw_vs_llvm.c
View File

@ -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;