summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2010-03-18 09:24:10 +0800
committerChia-I Wu <[email protected]>2010-03-18 09:43:23 +0800
commita0d615fd978aaa2e8ca2d31cb574f5de3890e140 (patch)
treef30cb9d82e58ac16adcdf45b24420cb02b263721
parentbd1ce874728c06d08a1f9881f51edbdd2f1c9db0 (diff)
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.
-rw-r--r--src/mesa/state_tracker/st_manager.c1
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 1b005c1ee17..6ec4c8d792c 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);