diff options
| author | Brian Paul <[email protected]> | 2010-01-22 17:56:35 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-01-22 17:56:37 -0700 |
| commit | 46c7cd665c9bc93e7254771b16b010fb10ce3707 (patch) | |
| tree | 6179adba61ea2c8d21b35370248a67d0571b2b53 | |
| parent | dd618a006aae870643049d191223c0dbc7ebc106 (diff) | |
st/mesa: fix incorrect freeing of drawpixels vertex shaders
These shaders are not st_vertex_shaders, but tgsi ureg shaders.
Fixes fd.o bug 25959.
| -rw-r--r-- | src/mesa/state_tracker/st_cb_drawpixels.c | 6 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_context.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index 4cec2598449..7afdc31ede9 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -1132,6 +1132,8 @@ st_destroy_drawpix(struct st_context *st) { st_reference_fragprog(st, &st->drawpix.z_shader, NULL); st_reference_fragprog(st, &st->pixel_xfer.combined_prog, NULL); - st_reference_vertprog(st, &st->drawpix.vert_shaders[0], NULL); - st_reference_vertprog(st, &st->drawpix.vert_shaders[1], NULL); + if (st->drawpix.vert_shaders[0]) + free(st->drawpix.vert_shaders[0]); + if (st->drawpix.vert_shaders[1]) + free(st->drawpix.vert_shaders[1]); } diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index 2c4943cfb0a..50e98d7146a 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -159,7 +159,7 @@ struct st_context /** for glDraw/CopyPixels */ struct { struct st_fragment_program *z_shader; - struct st_vertex_program *vert_shaders[2]; + void *vert_shaders[2]; /**< ureg shaders */ } drawpix; /** for glClear */ |