diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-18 16:17:50 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-18 16:17:50 -0600 |
| commit | 54fbd8bbd4e5a484d59907bae852908e3a8b8f3c (patch) | |
| tree | 2e45fac3c2505fe1131ed38e45110e1319f49806 /src/gallium/drivers/i915simple/i915_state.c | |
| parent | b4219e35e2de783ca03e53c311a8a56f8b633aa1 (diff) | |
| parent | a0bfeb0c3ca58a1f4d978f2aaa343ed4009de079 (diff) | |
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Diffstat (limited to 'src/gallium/drivers/i915simple/i915_state.c')
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_state.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/i915simple/i915_state.c b/src/gallium/drivers/i915simple/i915_state.c index 3d94b52366..4adeb37e86 100644 --- a/src/gallium/drivers/i915simple/i915_state.c +++ b/src/gallium/drivers/i915simple/i915_state.c @@ -33,6 +33,7 @@ #include "pipe/p_winsys.h" #include "pipe/p_util.h" #include "pipe/p_inlines.h" +#include "tgsi/util/tgsi_parse.h" #include "i915_context.h" #include "i915_reg.h" @@ -436,7 +437,7 @@ i915_create_fs_state(struct pipe_context *pipe, if (!ifs) return NULL; - ifs->state = *templ; + ifs->state.tokens = tgsi_dup_tokens(templ->tokens); tgsi_scan_shader(templ->tokens, &ifs->info); @@ -465,6 +466,8 @@ void i915_delete_fs_state(struct pipe_context *pipe, void *shader) FREE(ifs->program); ifs->program_len = 0; + FREE(ifs->state.tokens); + FREE(ifs); } |