summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2010-03-21 16:32:34 +0800
committerChia-I Wu <[email protected]>2010-03-21 16:32:34 +0800
commit12deb9e6ca76d222badf71c8643e84640673e86d (patch)
treeb11fef6689da399c661e8291d15ba938a6d88ab2 /src/mesa
parent162bc831c93bf8632b25c11f116a1405b93a1704 (diff)
parentfe5f070ef94219f12196bff6cb3274756ea03660 (diff)
Merge remote branch 'origin/gallium-st-api-dri'
Diffstat (limited to 'src/mesa')
-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);