From: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon, 10 Mar 2014 03:21:50 +0000 (+0900)
Subject: radeonsi: Use proper member name for deleting export shader PM4 state
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=678cf9618f252eea209c9f37211dde325223c5ae;p=mesa.git

radeonsi: Use proper member name for deleting export shader PM4 state

Fixes double-free with some piglit tests using geometry shaders.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 0ee415406d2..7d4f3c7409d 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -2360,6 +2360,8 @@ static void si_delete_shader_selector(struct pipe_context *ctx,
 			si_pm4_delete_state(sctx, gs, p->pm4);
 		else if (sel->type == PIPE_SHADER_FRAGMENT)
 			si_pm4_delete_state(sctx, ps, p->pm4);
+		else if (p->key.vs.as_es)
+			si_pm4_delete_state(sctx, es, p->pm4);
 		else
 			si_pm4_delete_state(sctx, vs, p->pm4);
 		si_pipe_shader_destroy(ctx, p);