From: Stéphane Marchesin <marcheu@chromium.org>
Date: Wed, 29 Jun 2011 03:38:07 +0000 (-0700)
Subject: i915g: If we have a program, that means the other fields are ours and we can free... 
X-Git-Tag: mesa-8.0-rc1~2945
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e6120576fa695ad46e6f23e65c6e4126c18a0e6;p=platform%2Fupstream%2Fmesa.git

i915g: If we have a program, that means the other fields are ours and we can free them.

Otherwise they probably belong to draw.
---

diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c
index 7c888b7..f412626 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);
 }