projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bd1ce87
)
st/mesa: Set the pipe context of the texture object.
author
Chia-I Wu
<olv@lunarg.com>
Thu, 18 Mar 2010 01:24:10 +0000
(09:24 +0800)
committer
Chia-I Wu
<olv@lunarg.com>
Thu, 18 Mar 2010 01:43:23 +0000
(09:43 +0800)
The field was added in
b8030c6561e019e079b5be2fe64ec804df4bfa03
. This
fixes a NULL dereference in xdemos/texture_from_pixmap.
src/mesa/state_tracker/st_manager.c
patch
|
blob
|
history
diff --git
a/src/mesa/state_tracker/st_manager.c
b/src/mesa/state_tracker/st_manager.c
index 1b005c1ee17c72568b2d6feda8d49c80124d786b..6ec4c8d792c847da7d70baa61668b01e92a7d908 100644
(file)
--- 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);