[Mesa-dev] [PATCH] tgsi: use TGSI_WRITEMASK_XYZW instead of hardcoding the mask

[Serge Martin]

On Thursday 04 February 2016 22:25:00 Samuel Pitoiset wrote:
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

Reviewed-by: Serge Martin <edb+mesa at sigluy.net>

> ---
>  src/gallium/auxiliary/tgsi/tgsi_transform.h | 2 +-
>  src/gallium/auxiliary/tgsi/tgsi_ureg.c      | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_transform.h
> b/src/gallium/auxiliary/tgsi/tgsi_transform.h index 3bd512b..27e6179 100644
> --- a/src/gallium/auxiliary/tgsi/tgsi_transform.h
> +++ b/src/gallium/auxiliary/tgsi/tgsi_transform.h
> @@ -192,7 +192,7 @@ tgsi_transform_sampler_view_decl(struct
> tgsi_transform_context *ctx,
> 
>     decl = tgsi_default_full_declaration();
>     decl.Declaration.File = TGSI_FILE_SAMPLER_VIEW;
> -   decl.Declaration.UsageMask = 0xf;
> +   decl.Declaration.UsageMask = TGSI_WRITEMASK_XYZW;
>     decl.Range.First =
>     decl.Range.Last = index;
>     decl.SamplerView.Resource = target;
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.c
> b/src/gallium/auxiliary/tgsi/tgsi_ureg.c index 52e3c66..a5a7704 100644
> --- a/src/gallium/auxiliary/tgsi/tgsi_ureg.c
> +++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
> @@ -1595,7 +1595,7 @@ emit_decl_sampler_view(struct ureg_program *ureg,
>     out[0].decl.Type = TGSI_TOKEN_TYPE_DECLARATION;
>     out[0].decl.NrTokens = 3;
>     out[0].decl.File = TGSI_FILE_SAMPLER_VIEW;
> -   out[0].decl.UsageMask = 0xf;
> +   out[0].decl.UsageMask = TGSI_WRITEMASK_XYZW;
> 
>     out[1].value = 0;
>     out[1].decl_range.First = index;
> @@ -1623,7 +1623,7 @@ emit_decl_image(struct ureg_program *ureg,
>     out[0].decl.Type = TGSI_TOKEN_TYPE_DECLARATION;
>     out[0].decl.NrTokens = 3;
>     out[0].decl.File = TGSI_FILE_IMAGE;
> -   out[0].decl.UsageMask = 0xf;
> +   out[0].decl.UsageMask = TGSI_WRITEMASK_XYZW;
> 
>     out[1].value = 0;
>     out[1].decl_range.First = index;
> @@ -1648,7 +1648,7 @@ emit_decl_buffer(struct ureg_program *ureg,
>     out[0].decl.Type = TGSI_TOKEN_TYPE_DECLARATION;
>     out[0].decl.NrTokens = 2;
>     out[0].decl.File = TGSI_FILE_BUFFER;
> -   out[0].decl.UsageMask = 0xf;
> +   out[0].decl.UsageMask = TGSI_WRITEMASK_XYZW;
>     out[0].decl.Atomic = atomic;
>     out[0].decl.Shared = shared;