Mesa (master): radeonsi: avoid stale pointers in si_delete_shader_selector
Christian König
deathsimple at kemper.freedesktop.org
Sat Mar 8 15:10:36 UTC 2014
Module: Mesa
Branch: master
Commit: 1a8c66023b0b7679ec7d310707e0dd005540d529
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a8c66023b0b7679ec7d310707e0dd005540d529
Author: Christian König <christian.koenig at amd.com>
Date: Sat Mar 8 14:16:23 2014 +0100
radeonsi: avoid stale pointers in si_delete_shader_selector
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_state.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 8f90000..0ee4154 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -2356,7 +2356,12 @@ static void si_delete_shader_selector(struct pipe_context *ctx,
while (p) {
c = p->next_variant;
- si_pm4_delete_state(sctx, vs, p->pm4);
+ if (sel->type == PIPE_SHADER_GEOMETRY)
+ si_pm4_delete_state(sctx, gs, p->pm4);
+ else if (sel->type == PIPE_SHADER_FRAGMENT)
+ si_pm4_delete_state(sctx, ps, p->pm4);
+ else
+ si_pm4_delete_state(sctx, vs, p->pm4);
si_pipe_shader_destroy(ctx, p);
free(p);
p = c;
More information about the mesa-commit
mailing list