[PATCH vkd3d 07/17] vkd3d-shader/hlsl: Unify type minor/major size functions.

[Matteo Bruni]

On Fri, Jul 15, 2022 at 3:24 AM Francisco Casas <fcasas at codeweavers.com> wrote:
>
> Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
> ---
>
> v2:
> * No changes.
>
> Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
> ---
>  libs/vkd3d-shader/hlsl.c         | 16 ++++++++++++++++
>  libs/vkd3d-shader/hlsl.h         |  2 ++
>  libs/vkd3d-shader/hlsl.y         | 20 ++------------------
>  libs/vkd3d-shader/hlsl_codegen.c | 28 ++++++----------------------
>  4 files changed, 26 insertions(+), 40 deletions(-)
>
> diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
> index e4e2ca17..d3ceba35 100644
> --- a/libs/vkd3d-shader/hlsl.c
> +++ b/libs/vkd3d-shader/hlsl.c
> @@ -124,6 +124,22 @@ bool hlsl_type_is_row_major(const struct hlsl_type *type)
>      return !!(type->modifiers & HLSL_MODIFIER_ROW_MAJOR);
>  }
>
> +unsigned int hlsl_type_minor_size(const struct hlsl_type *type)
> +{
> +    if (type->type != HLSL_CLASS_MATRIX || hlsl_type_is_row_major(type))
> +        return type->dimx;
> +    else
> +        return type->dimy;
> +}
> +
> +unsigned int hlsl_type_major_size(const struct hlsl_type *type)
> +{
> +    if (type->type != HLSL_CLASS_MATRIX || hlsl_type_is_row_major(type))
> +        return type->dimy;
> +    else
> +        return type->dimx;
> +}
> +
>  static unsigned int get_array_size(const struct hlsl_type *type)
>  {
>      if (type->type == HLSL_CLASS_ARRAY)
> diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
> index 2a6402ce..546c87f3 100644
> --- a/libs/vkd3d-shader/hlsl.h
> +++ b/libs/vkd3d-shader/hlsl.h
> @@ -799,6 +799,8 @@ unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type);
>  unsigned int hlsl_compute_component_offset(struct hlsl_ctx *ctx, struct hlsl_type *type,
>          unsigned int idx, struct hlsl_type **comp_type);
>  bool hlsl_type_is_row_major(const struct hlsl_type *type);
> +unsigned int hlsl_type_minor_size(const struct hlsl_type *type);
> +unsigned int hlsl_type_major_size(const struct hlsl_type *type);
>  unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int offset);
>  bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2);
>
> diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
> index b4ca4631..a1d39140 100644
> --- a/libs/vkd3d-shader/hlsl.y
> +++ b/libs/vkd3d-shader/hlsl.y
> @@ -1216,22 +1216,6 @@ static bool expr_common_shape(struct hlsl_ctx *ctx, struct hlsl_type *t1, struct
>      return true;
>  }
>
> -static unsigned int minor_size(const struct hlsl_type *type)
> -{
> -    if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)
> -        return type->dimx;
> -    else
> -        return type->dimy;
> -}
> -
> -static unsigned int major_size(const struct hlsl_type *type)
> -{
> -    if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)
> -        return type->dimy;
> -    else
> -        return type->dimx;
> -}
> -
>  static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs,
>          enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS],
>          struct hlsl_type *type, const struct vkd3d_shader_location *loc)
> @@ -1247,7 +1231,7 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs,
>          struct hlsl_ir_load *load;
>          struct hlsl_ir_var *var;
>
> -        vector_type = hlsl_get_vector_type(ctx, type->base_type, minor_size(type));
> +        vector_type = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type));
>
>          name = vkd3d_string_buffer_get(&ctx->string_buffers);
>          vkd3d_string_buffer_printf(name, "<split_op-%u>", counter++);
> @@ -1256,7 +1240,7 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs,
>          if (!var)
>              return NULL;
>
> -        for (i = 0; i < major_size(type); i++)
> +        for (i = 0; i < hlsl_type_major_size(type); i++)

Nitpick, while at it you could change i++ to ++i as well.