diff options
| author | Brian Paul <brianp@vmware.com> | 2014-01-27 12:04:01 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2014-02-02 06:47:32 -0700 |
| commit | 76c33e383c5b1134b0f1500cf88326e86631e7a9 (patch) | |
| tree | 24dca2ab8c744386d5ec827b45e5374d5f64cad3 /src/mesa/drivers/dri/r200 | |
| parent | 1cdeeef6c400979a0497afde52bf351a623a934f (diff) | |
| download | external_mesa3d-76c33e383c5b1134b0f1500cf88326e86631e7a9.zip external_mesa3d-76c33e383c5b1134b0f1500cf88326e86631e7a9.tar.gz external_mesa3d-76c33e383c5b1134b0f1500cf88326e86631e7a9.tar.bz2 | |
r200: use _mesa_get_current_tex_object() in r200SetTexBuffer2()
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_texstate.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c index 5160c2c..c3c92cb 100644 --- a/src/mesa/drivers/dri/r200/r200_texstate.c +++ b/src/mesa/drivers/dri/r200/r200_texstate.c @@ -712,7 +712,6 @@ static GLboolean r200UpdateTextureEnv( struct gl_context *ctx, int unit, int slo void r200SetTexBuffer2(__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; @@ -726,9 +725,8 @@ void r200SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format radeon = pDRICtx->driverPrivate; rfb = dPriv->driverPrivate; - texUnit = &radeon->glCtx.Texture.Unit[radeon->glCtx.Texture.CurrentUnit]; - 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); |