Module: Mesa Branch: gallium-st-api-dri Commit: a0d615fd978aaa2e8ca2d31cb574f5de3890e140 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0d615fd978aaa2e8ca2d31cb574f5de3890e140
Author: Chia-I Wu <[email protected]> Date: Thu Mar 18 09:24:10 2010 +0800 st/mesa: Set the pipe context of the texture object. The field was added in b8030c6561e019e079b5be2fe64ec804df4bfa03. This fixes a NULL dereference in xdemos/texture_from_pixmap. --- src/mesa/state_tracker/st_manager.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index 1b005c1..6ec4c8d 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -553,6 +553,7 @@ st_context_teximage(struct st_context_iface *stctxi, enum st_texture_type target _mesa_clear_texture_image(ctx, texImage); } + stObj->pipe = st->pipe; pipe_texture_reference(&stImage->pt, tex); _mesa_dirty_texobj(ctx, texObj, GL_TRUE); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
