[Mesa-stable] [PATCH] st/mesa: check the texture image level in st_texture_match_image

Nicolai Hähnle nhaehnle at gmail.com
Fri Jun 24 15:59:30 UTC 2016


From: Nicolai Hähnle <nicolai.haehnle at amd.com>

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 at lists.freedesktop.org>
---
 src/mesa/state_tracker/st_texture.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index 52b0943..54dd932 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -226,6 +226,11 @@ st_texture_match_image(struct st_context *st,
        ptLayers != pt->array_size)
       return GL_FALSE;
 
+   /* Test that the image level fits .
+    */
+   if (image->Level > pt->last_level)
+      return GL_FALSE;
+
    return GL_TRUE;
 }
 
-- 
2.7.4



More information about the mesa-stable mailing list