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

Brian Paul brianp at kemper.freedesktop.org
Fri Dec 30 23:43:43 UTC 2011


Module: Mesa
Branch: master
Commit: 99fbf7ce341c346631d11395c792a0589c5035dd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=99fbf7ce341c346631d11395c792a0589c5035dd

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Dec 30 16:39:24 2011 -0700

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.

---

 src/mesa/state_tracker/st_cb_texture.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index ecd21ad..cf9d068 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.
     */




More information about the mesa-commit mailing list