summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Marchesin <[email protected]>2011-06-28 20:38:07 -0700
committerStéphane Marchesin <[email protected]>2011-06-28 20:42:39 -0700
commit4e6120576fa695ad46e6f23e65c6e4126c18a0e6 (patch)
tree1d7003fe1250065e4ce91a4b4631695550c9f69d
parentc66877c29034af411b06f1f1d1e17b6c048ac38d (diff)
i915g: If we have a program, that means the other fields are ours and we can free them.
Otherwise they probably belong to draw.
-rw-r--r--src/gallium/drivers/i915/i915_state.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c
index 7c888b798dc..f412626955d 100644
--- a/src/gallium/drivers/i915/i915_state.c
+++ b/src/gallium/drivers/i915/i915_state.c
@@ -507,12 +507,14 @@ void i915_delete_fs_state(struct pipe_context *pipe, void *shader)
{
struct i915_fragment_shader *ifs = (struct i915_fragment_shader *) shader;
- if (ifs->program)
+ if (ifs->program) {
FREE(ifs->program);
+ ifs->program = NULL;
+ FREE((struct tgsi_token *)ifs->state.tokens);
+ ifs->state.tokens = NULL;
+ }
ifs->program_len = 0;
- FREE((struct tgsi_token *)ifs->state.tokens);
-
FREE(ifs);
}