From a0d615fd978aaa2e8ca2d31cb574f5de3890e140 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Thu, 18 Mar 2010 09:24:10 +0800
Subject: 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 file changed, 1 insertion(+)

(limited to 'src/mesa')

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);
-- 
cgit v1.2.3