From: Brian Paul <brianp@vmware.com>
Date: Thu, 17 Mar 2011 03:13:31 +0000 (-0600)
Subject: mesa: remove unneeded local var in BindTexture()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=552f54bf0490dabce3fac6d17e78ac65411fde5c;p=mesa.git

mesa: remove unneeded local var in BindTexture()
---

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 10ddc77b459..c06bbb67e5f 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1015,7 +1015,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
    GET_CURRENT_CONTEXT(ctx);
    const GLuint unit = ctx->Texture.CurrentUnit;
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-   struct gl_texture_object *newTexObj = NULL, *defaultTexObj = NULL;
+   struct gl_texture_object *newTexObj = NULL;
    GLint targetIndex;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
@@ -1029,13 +1029,13 @@ _mesa_BindTexture( GLenum target, GLuint texName )
       return;
    }
    assert(targetIndex < NUM_TEXTURE_TARGETS);
-   defaultTexObj = ctx->Shared->DefaultTex[targetIndex];
 
    /*
     * Get pointer to new texture object (newTexObj)
     */
    if (texName == 0) {
-      newTexObj = defaultTexObj;
+      /* Use a default texture object */
+      newTexObj = ctx->Shared->DefaultTex[targetIndex];
    }
    else {
       /* non-default texture object */