[PATCH vkd3d v3 01/14] vkd3d-shader/hlsl: Define a symbolic constant to represent the D3D_SIF_TEXTURE_COMPONENTS shift.

[Giovanni Mascellani]

Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>

On 05/11/21 19:35, Matteo Bruni wrote:
> From: Zebediah Figura <zfigura at codeweavers.com>
> 
> Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
> Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
> ---
>   libs/vkd3d-shader/hlsl_sm4.c | 2 +-
>   libs/vkd3d-shader/sm4.h      | 3 +++
>   2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
> index 9d45e163..f8eb0a1e 100644
> --- a/libs/vkd3d-shader/hlsl_sm4.c
> +++ b/libs/vkd3d-shader/hlsl_sm4.c
> @@ -561,7 +561,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc)
>               put_u32(&buffer, sm4_resource_format(var->data_type));
>               put_u32(&buffer, sm4_rdef_resource_dimension(var->data_type));
>               put_u32(&buffer, ~0u); /* FIXME: multisample count */
> -            flags |= (var->data_type->e.resource_format->dimx - 1) << 2;
> +            flags |= (var->data_type->e.resource_format->dimx - 1) << VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT;
>           }
>           put_u32(&buffer, var->reg.id);
>           put_u32(&buffer, 1); /* bind count */
> diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h
> index ddcb9a86..17a08ee2 100644
> --- a/libs/vkd3d-shader/sm4.h
> +++ b/libs/vkd3d-shader/sm4.h
> @@ -526,4 +526,7 @@ enum vkd3d_sm4_shader_data_type
>       VKD3D_SM4_SHADER_DATA_MESSAGE                   = 0x4,
>   };
>   
> +/* The shift that corresponds to the D3D_SIF_TEXTURE_COMPONENTS mask. */
> +#define VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT 2
> +
>   #endif  /* __VKD3D_SM4_H */
>