diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-05 23:40:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-05 23:42:09 +0100 |
| commit | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (patch) | |
| tree | ba0af42750f0ab6dc4724342a7063835636222b5 /mesalib/src/mesa/state_tracker/st_cb_program.c | |
| parent | 87e58a93f7248171e736656080069cb65ff56aae (diff) | |
| parent | 8574eba804031f6b19713f0b02952280730bf62e (diff) | |
| download | vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.gz vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.bz2 vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/queryobj.c
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_program.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_program.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_program.c b/mesalib/src/mesa/state_tracker/st_cb_program.c index faff9c4bd..aa301d830 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_program.c +++ b/mesalib/src/mesa/state_tracker/st_cb_program.c @@ -143,11 +143,6 @@ st_delete_program(struct gl_context *ctx, struct gl_program *prog) if (stgp->glsl_to_tgsi) free_glsl_to_tgsi_visitor(stgp->glsl_to_tgsi); - - if (stgp->tgsi.tokens) { - st_free_tokens((void *) stgp->tgsi.tokens); - stgp->tgsi.tokens = NULL; - } } break; case GL_FRAGMENT_PROGRAM_ARB: @@ -207,11 +202,6 @@ st_program_string_notify( struct gl_context *ctx, st_release_gp_variants(st, stgp); - if (stgp->tgsi.tokens) { - st_free_tokens((void *) stgp->tgsi.tokens); - stgp->tgsi.tokens = NULL; - } - if (st->gp == stgp) st->dirty.st |= ST_NEW_GEOMETRY_PROGRAM; } |