From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Fri, 24 Jun 2016 15:54:51 +0000 (+0200)
Subject: st/mesa: check the texture image level in st_texture_match_image
X-Git-Tag: upstream/17.1.0~8372
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07cc838b105dd3f34526db73064f1f21b452240e;p=platform%2Fupstream%2Fmesa.git

st/mesa: check the texture image level in st_texture_match_image

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>
---

diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index 52b0943..42616ca 100644
--- 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;
 }