diff options
| author | Younes Manton <[email protected]> | 2008-07-23 23:35:23 -0400 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2008-07-23 23:46:45 -0400 |
| commit | a8da04cb861b8f9caf3acd33f52f64621f0c15e2 (patch) | |
| tree | bacbfd492330e23f9d670e4319c3f8c07f004153 /src/gallium/drivers/nv10/nv10_state.c | |
| parent | b4d198e47704f3b79c5a61877846172ae9d4b4c0 (diff) | |
nv all: Copy shader tokens on create, free on delete.
Must copy token stream on shader create, client is allowed to free
their copy after creating the state object.
Diffstat (limited to 'src/gallium/drivers/nv10/nv10_state.c')
| -rw-r--r-- | src/gallium/drivers/nv10/nv10_state.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv10/nv10_state.c b/src/gallium/drivers/nv10/nv10_state.c index 9b8b7801cdf..43b9c32f12d 100644 --- a/src/gallium/drivers/nv10/nv10_state.c +++ b/src/gallium/drivers/nv10/nv10_state.c @@ -4,6 +4,7 @@ #include "pipe/p_util.h" #include "pipe/p_shader_tokens.h" +#include "tgsi/util/tgsi_parse.h" #include "nv10_context.h" #include "nv10_state.h" @@ -407,7 +408,7 @@ nv10_fp_state_create(struct pipe_context *pipe, struct nv10_fragment_program *fp; fp = CALLOC(1, sizeof(struct nv10_fragment_program)); - fp->pipe = cso; + fp->pipe.tokens = tgsi_dup_tokens(cso->tokens); tgsi_scan_shader(cso->tokens, &fp->info); @@ -431,6 +432,7 @@ nv10_fp_state_delete(struct pipe_context *pipe, void *hwcso) struct nv10_fragment_program *fp = hwcso; nv10_fragprog_destroy(nv10, fp); + FREE((void*)fp->pipe.tokens); FREE(fp); } |