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

mesa: use _mesa_get_current_tex_unit() helper in BindTexture()
---

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index c06bbb67e5f..c1e3e4dec79 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -39,6 +39,7 @@
 #include "macros.h"
 #include "teximage.h"
 #include "texobj.h"
+#include "texstate.h"
 #include "mtypes.h"
 #include "program/prog_instruction.h"
 
@@ -1013,8 +1014,7 @@ void GLAPIENTRY
 _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_unit *texUnit = _mesa_get_current_tex_unit(ctx);
    struct gl_texture_object *newTexObj = NULL;
    GLint targetIndex;
    ASSERT_OUTSIDE_BEGIN_END(ctx);