OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mesa_7_7_branch'
[android-x86/external-mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_texture.c
diff --git
a/src/mesa/state_tracker/st_cb_texture.c
b/src/mesa/state_tracker/st_cb_texture.c
index
6e1ecb1
..
0cec23f
100644
(file)
--- a/
src/mesa/state_tracker/st_cb_texture.c
+++ b/
src/mesa/state_tracker/st_cb_texture.c
@@
-1090,7
+1090,7
@@
st_TexSubimage(GLcontext *ctx, GLint dims, GLenum target, GLint level,
done:
_mesa_unmap_teximage_pbo(ctx, packing);
- if (stImage->pt) {
+ if (stImage->pt
&& texImage->Data
) {
st_texture_image_unmap(ctx->st, stImage);
texImage->Data = NULL;
}