[Mesa-dev] [PATCH 1/6] r200: use _mesa_get_current_tex_object() in r200SetTexBuffer2()

[Kenneth Graunke]

On 01/31/2014 04:11 PM, Brian Paul wrote:
> ---
>  src/mesa/drivers/dri/r200/r200_texstate.c |    6 ++----
>  1 file 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);
> 

This series is:
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20140201/56e31222/attachment.pgp>