1 files changed, 7 insertions, 7 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
index 5fcd806e0..d04ec696f 100644
--- a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
@@ -336,6 +336,11 @@ st_generate_mipmap(struct gl_context *ctx, GLenum target,
    if (lastLevel == 0)

       return;

 

+   /* The texture isn't in a "complete" state yet so set the expected

+    * lastLevel here, since it won't get done in st_finalize_texture().

+    */

+   stObj->lastLevel = lastLevel;

+

    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.

@@ -353,11 +358,6 @@ st_generate_mipmap(struct gl_context *ctx, GLenum target,
                                     oldTex->array_size,

                                     oldTex->bind);

 

-      /* The texture isn't in a "complete" state yet so set the expected

-       * lastLevel here, since it won't get done in st_finalize_texture().

-       */

-      stObj->lastLevel = lastLevel;

-

       /* This will copy the old texture's base image into the new texture

        * which we just allocated.

        */

@@ -366,8 +366,6 @@ st_generate_mipmap(struct gl_context *ctx, GLenum target,
       /* release the old tex (will likely be freed too) */

       pipe_resource_reference(&oldTex, NULL);

       pipe_sampler_view_reference(&stObj->sampler_view, NULL);

-

-      pt = stObj->pt;

    }

    else {

       /* Make sure that the base texture image data is present in the

@@ -376,6 +374,8 @@ st_generate_mipmap(struct gl_context *ctx, GLenum target,
       st_finalize_texture(ctx, st->pipe, texObj);

    }

 

+   pt = stObj->pt;

+

    assert(pt->last_level >= lastLevel);

 

    /* Try to generate the mipmap by rendering/texturing.  If that fails,