Mesa (master): st/mesa: use _mesa_get_current_tex_object() in st_context_teximage()
Brian Paul
brianp at kemper.freedesktop.org
Sun Feb 2 13:56:27 UTC 2014
Module: Mesa
Branch: master
Commit: ed7211589161c3ec3157b669120b5bf49dd54d54
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ed7211589161c3ec3157b669120b5bf49dd54d54
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jan 27 12:06:39 2014 -0700
st/mesa: use _mesa_get_current_tex_object() in st_context_teximage()
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/state_tracker/st_manager.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index b7757e9..215b276 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);
More information about the mesa-commit
mailing list