From: Brian Paul <brianp@vmware.com>
Date: Fri, 30 Dec 2011 23:39:24 +0000 (-0700)
Subject: st/mesa: remove stImage->base.Face/Level assignments in st_TexImage()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=99fbf7ce341c346631d11395c792a0589c5035dd;p=mesa.git

st/mesa: remove stImage->base.Face/Level assignments in st_TexImage()

This fixes a regresssion (broken cube maps) caused by the
ctx->Driver.TexImage parameter simplification commit.  The target var
is always GL_TEXTURE_CUBE_MAP at this point so the Face field was always
getting set to zero.

These field assignments aren't needed anyway since core Mesa sets them.
---

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index ecd21ad9200..cf9d068e36f 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -544,9 +544,6 @@ st_TexImage(struct gl_context * ctx,
    assert(texImage->Height == height);
    assert(texImage->Depth == depth);
 
-   stImage->base.Face = _mesa_tex_target_to_face(target);
-   stImage->base.Level = level;
-
    /* Release the reference to a potentially orphaned buffer.   
     * Release any old malloced memory.
     */