[PATCH 3/3] d3dcompiler: Store some builtin types in the hlsl_ctx structure.

[Matteo Bruni]

On Wed, May 20, 2020 at 3:23 AM Zebediah Figura <z.figura12 at gmail.com> wrote:
>
> Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
> ---
>  dlls/d3dcompiler_43/d3dcompiler_private.h |  10 ++
>  dlls/d3dcompiler_43/hlsl.y                | 132 +++++++++++-----------
>  2 files changed, 78 insertions(+), 64 deletions(-)
>
> diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h
> index 6c2f234c4dd..0a8f85e7974 100644
> --- a/dlls/d3dcompiler_43/d3dcompiler_private.h
> +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h
> @@ -595,6 +595,7 @@ enum hlsl_sampler_dim
>     HLSL_SAMPLER_DIM_2D,
>     HLSL_SAMPLER_DIM_3D,
>     HLSL_SAMPLER_DIM_CUBE,
> +   HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBE
>  };
>
>  enum hlsl_matrix_majority
> @@ -983,6 +984,15 @@ struct hlsl_parse_ctx
>      const struct hlsl_ir_function_decl *cur_function;
>
>      enum hlsl_matrix_majority matrix_majority;
> +
> +    struct
> +    {
> +        struct hlsl_type *scalar[HLSL_TYPE_LAST_SCALAR + 1];
> +        struct hlsl_type *sampler[HLSL_SAMPLER_DIM_MAX + 1];
> +        struct hlsl_type *Void;

Curse you, C keywords...

> +    } builtin_types;
> +
> +    struct hlsl_type *builtin_void, builtin_int, *builtin_uint, *builtin_float;

I assume these are remnants of a previous version of the patch.