OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5469fc9
)
st/mesa: check the texture image level in st_texture_match_image
author
Nicolai Hähnle
<nicolai.haehnle@amd.com>
Fri, 24 Jun 2016 15:54:51 +0000
(17:54 +0200)
committer
Emil Velikov
<emil.l.velikov@gmail.com>
Thu, 7 Jul 2016 15:12:32 +0000
(16:12 +0100)
Otherwise, 1x1 images of arbitrarily high level are accepted.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96639#add_comment
Cc: 11.2 12.0 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
(cherry picked from commit
07cc838b105dd3f34526db73064f1f21b452240e
)
src/mesa/state_tracker/st_texture.c
patch
|
blob
|
history
diff --git
a/src/mesa/state_tracker/st_texture.c
b/src/mesa/state_tracker/st_texture.c
index
52b0943
..
42616ca
100644
(file)
--- a/
src/mesa/state_tracker/st_texture.c
+++ b/
src/mesa/state_tracker/st_texture.c
@@
-226,6
+226,9
@@
st_texture_match_image(struct st_context *st,
ptLayers != pt->array_size)
return GL_FALSE;
+ if (image->Level > pt->last_level)
+ return GL_FALSE;
+
return GL_TRUE;
}