summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2011-03-16 21:13:31 -0600
committerBrian Paul <[email protected]>2011-03-16 21:13:31 -0600
commit552f54bf0490dabce3fac6d17e78ac65411fde5c (patch)
tree1d257801a4583660f7117ef2c475f886ab09069f /src/mesa
parentdfda559b9867d70b70b99c0f3e751fd5930bdc01 (diff)
mesa: remove unneeded local var in BindTexture()
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/texobj.c6
1 files changed, 3 insertions, 3 deletions
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 */