[Mesa-dev] Mesa (master): i965: Fix tex_swizzle when depth mode is GL_RED

[Ian Romanick]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 03/14/2011 01:04 PM, Kenneth Graunke wrote:
> Module: Mesa
> Branch: master
> Commit: 1842b89f77bb7bd283b61e27cd69c643f2a60a22
> URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1842b89f77bb7bd283b61e27cd69c643f2a60a22
> 
> Author: Chad Versace <chad.versace at intel.com>
> Date:   Sat Mar 12 17:49:41 2011 -0800
> 
> i965: Fix tex_swizzle when depth mode is GL_RED
> 
> Change swizzle from (x000) to (x001).

I don't think we need 1.30 to hit this path (just GL_ARB_texture_rg?).
Do we have a test case?  Should this be a stable-branch candidate?

> Signed-off-by: Chad Versace <chad.versace at intel.com>
> Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
> 
> ---
> 
>  src/mesa/drivers/dri/i965/brw_wm.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
> index 390b3d6..ca17e80 100644
> --- a/src/mesa/drivers/dri/i965/brw_wm.c
> +++ b/src/mesa/drivers/dri/i965/brw_wm.c
> @@ -377,9 +377,10 @@ static void brw_wm_populate_key( struct brw_context *brw,
>  	    } else if (t->DepthMode == GL_LUMINANCE) {
>  	       swizzles[3] = SWIZZLE_ONE;
>  	    } else if (t->DepthMode == GL_RED) {
> +	       /* See table 3.23 of the GL 3.0 spec. */
>  	       swizzles[1] = SWIZZLE_ZERO;
>  	       swizzles[2] = SWIZZLE_ZERO;
> -	       swizzles[3] = SWIZZLE_ZERO;
> +	       swizzles[3] = SWIZZLE_ONE;
>  	    }
>  	 }
>  
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk1+r4wACgkQX1gOwKyEAw8JDgCfdkeYtjWDmfpAqRwrMIxuJLhK
tV4An1LV1yipqwLqbCF8CjWK5krbclPe
=vR6T
-----END PGP SIGNATURE-----