aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2014-01-27 12:05:19 -0700
committerBrian Paul <[email protected]>2014-02-02 06:47:32 -0700
commit8b4f6fada2f13e42a289f63a469450fb41a5968e (patch)
treeb7325433e85c8cdf969c4a6db1d61d8b91be662d /src
parent76c33e383c5b1134b0f1500cf88326e86631e7a9 (diff)
radeon: use _mesa_get_current_tex_object() in radeonSetTexBuffer2()
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_texstate.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c
index 66daccf0895..dac8aedddec 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texstate.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c
@@ -589,7 +589,6 @@ static GLboolean radeonUpdateTextureEnv( struct gl_context *ctx, int unit )
void radeonSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format,
__DRIdrawable *dPriv)
{
- struct gl_texture_unit *texUnit;
struct gl_texture_object *texObj;
struct gl_texture_image *texImage;
struct radeon_renderbuffer *rb;
@@ -603,9 +602,8 @@ void radeonSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_form
radeon = pDRICtx->driverPrivate;
rfb = dPriv->driverPrivate;
- texUnit = _mesa_get_current_tex_unit(&radeon->glCtx);
- texObj = _mesa_select_tex_object(&radeon->glCtx, texUnit, target);
- texImage = _mesa_get_tex_image(&radeon->glCtx, texObj, target, 0);
+ texObj = _mesa_get_current_tex_object(&radeon->glCtx, target);
+ texImage = _mesa_get_tex_image(&radeon->glCtx, texObj, target, 0);
rImage = get_radeon_texture_image(texImage);
t = radeon_tex_obj(texObj);