From: Brian Paul <brianp@vmware.com>
Date: Mon, 27 Jan 2014 19:06:39 +0000 (-0700)
Subject: st/mesa: use _mesa_get_current_tex_object() in st_context_teximage()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ed7211589161c3ec3157b669120b5bf49dd54d54;p=mesa.git

st/mesa: use _mesa_get_current_tex_object() in st_context_teximage()

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index b7757e9fe53..215b27634f5 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -469,7 +469,6 @@ st_context_teximage(struct st_context_iface *stctxi,
 {
    struct st_context *st = (struct st_context *) stctxi;
    struct gl_context *ctx = st->ctx;
-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
    struct st_texture_object *stObj;
@@ -495,7 +494,8 @@ st_context_teximage(struct st_context_iface *stctxi,
       return FALSE;
    }
 
-   texObj = _mesa_select_tex_object(ctx, texUnit, target);
+   texObj = _mesa_get_current_tex_object(ctx, target);
+
    _mesa_lock_texture(ctx, texObj);
 
    stObj = st_texture_object(texObj);