From: Younes Manton <younes.m@gmail.com>
Date: Mon, 21 Dec 2009 01:11:55 +0000 (-0500)
Subject: st/mesa: Check for single level mipmap trees.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ace937f1651c64d7fb22917489e29761130aaa0d;p=mesa.git

st/mesa: Check for single level mipmap trees.

The assert in util_gen_mipmap() caught it, although
it does the right thing anyway.
---

diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c
index f75b2348b82..c3bea3172a5 100644
--- a/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/src/mesa/state_tracker/st_gen_mipmap.c
@@ -215,6 +215,9 @@ st_generate_mipmap(GLcontext *ctx, GLenum target,
    /* find expected last mipmap level */
    lastLevel = compute_num_levels(ctx, texObj, target) - 1;
 
+   if (lastLevel == 0)
+      return;
+
    if (pt->last_level < lastLevel) {
       /* The current gallium texture doesn't have space for all the
        * mipmap levels we need to generate.  So allocate a new texture.