summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2021-01-11 11:09:12 -0800
committerMarge Bot <eric+marge@anholt.net>2021-01-12 19:46:22 +0000
commita4a5045d59adc8f7bac56b3828551c94b23f3617 (patch)
treef0d47c6d0bd78a183662be70bc02ec2779402fab
parent4ddcd9cf165deba2605f5729a0af2f7ded0baad9 (diff)
mesa/st: Free the ARB_vp/fp nir-to-tgsi temporary tokens.
The driver interface doesn't take ownership of the TGSI tokens, so free our temporary. Fixes: cf3fc79cd0ab ("st/mesa: Replace mesa_to_tgsi() with prog_to_nir() and nir_to_tgsi().") Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8422>
-rw-r--r--src/mesa/state_tracker/st_program.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 7e360d3e676..7b8d27cf101 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -745,6 +745,9 @@ st_create_vp_variant(struct st_context *st,
else
vpv->base.driver_shader = pipe->create_vs_state(pipe, &state);
+ if (state.type == PIPE_SHADER_IR_TGSI)
+ tgsi_free_tokens(state.tokens);
+
return vpv;
}
@@ -1351,6 +1354,9 @@ st_create_fp_variant(struct st_context *st,
variant->base.driver_shader = pipe->create_fs_state(pipe, &state);
variant->key = *key;
+ if (state.type == PIPE_SHADER_IR_TGSI)
+ tgsi_free_tokens(state.tokens);
+
return variant;
}