summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-11-17 21:41:22 -0700
committerBrian Paul <brianp@vmware.com>2009-11-17 22:28:50 -0700
commit35216f98f0522dffc2fb0e8bc45e44d84485bda2 (patch)
treee9a997282341b2a8248c9d8281a527c13edfae11
parent569da4440325f3a212bc4e25f7c29bdcdbe65e22 (diff)
st/mesa: use _mesa_get_current_tex_object()
-rw-r--r--src/mesa/state_tracker/st_texture.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index 541fa588a3..0eebe6a9ce 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -507,8 +507,6 @@ st_bind_teximage(struct st_framebuffer *stfb, uint surfIndex,
struct st_context *st = ctx->st;
struct pipe_context *pipe = st->pipe;
struct pipe_screen *screen = pipe->screen;
- const GLuint unit = ctx->Texture.CurrentUnit;
- struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
struct gl_texture_object *texObj;
struct gl_texture_image *texImage;
struct st_texture_image *stImage;
@@ -525,7 +523,7 @@ st_bind_teximage(struct st_framebuffer *stfb, uint surfIndex,
}
if (target == ST_TEXTURE_2D) {
- texObj = texUnit->CurrentTex[TEXTURE_2D_INDEX];
+ texObj = _mesa_get_current_tex_object(ctx, GL_TEXTURE_2D);
texImage = _mesa_get_tex_image(ctx, texObj, GL_TEXTURE_2D, level);
stImage = st_texture_image(texImage);
}