From: Joakim Sindholt Date: Tue, 12 May 2009 19:41:48 +0000 (+0200) Subject: r300-gallium: duplicate tokens in create_fs_state X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=62c0c7d81a3f271b7dc7177467f9c884e89f9eee;p=mesa.git r300-gallium: duplicate tokens in create_fs_state This was all phoenix64's idea. Credit goes to him --- diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 0143e228c4e..80e11d6ecf3 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -289,6 +289,7 @@ static void* r300_create_fs_state(struct pipe_context* pipe, /* Copy state directly into shader. */ fs->state = *shader; + fs->state.tokens = tgsi_dup_tokens(shader->tokens); tgsi_scan_shader(shader->tokens, &fs->info); @@ -317,6 +318,8 @@ static void r300_bind_fs_state(struct pipe_context* pipe, void* shader) /* Delete fragment shader state. */ static void r300_delete_fs_state(struct pipe_context* pipe, void* shader) { + struct r3xx_fragment_shader* fs = (struct r3xx_fragment_shader*)shader + FREE(fs->state.tokens); FREE(shader); }