Mesa (master): radeonsi: avoid stale state pointers

[Christian König]

Module: Mesa
Branch: master
Commit: 1fa2acba6195230fc738d2854678bc28864ca5c0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1fa2acba6195230fc738d2854678bc28864ca5c0

Author: Christian König <christian.koenig at amd.com>
Date:   Sat Mar  8 14:18:30 2014 +0100

radeonsi: avoid stale state pointers

Signed-off-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/radeonsi/si_pipe.c |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index ff11a67..ac9e49a 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -83,15 +83,9 @@ static void si_destroy_context(struct pipe_context *context)
 	pipe_resource_reference(&sctx->null_const_buf.buffer, NULL);
 	r600_resource_reference(&sctx->border_color_table, NULL);
 
-	if (sctx->gs_on) {
-		si_pm4_free_state(sctx, sctx->gs_on, 0);
-	}
-	if (sctx->gs_off) {
-		si_pm4_free_state(sctx, sctx->gs_off, 0);
-	}
-	if (sctx->gs_rings) {
-		si_pm4_free_state(sctx, sctx->gs_rings, 0);
-	}
+	si_pm4_delete_state(sctx, gs_rings, sctx->gs_rings);
+	si_pm4_delete_state(sctx, gs_onoff, sctx->gs_on);
+	si_pm4_delete_state(sctx, gs_onoff, sctx->gs_off);
 
 	if (sctx->dummy_pixel_shader) {
 		sctx->b.b.delete_fs_state(&sctx->b.b, sctx->dummy_pixel_shader);