[PATCH v5 vkd3d 12/13] vkd3d-shader/hlsl: Implement texture gather methods.

[Matteo Bruni]

On Wed, Dec 22, 2021 at 12:23 AM Zebediah Figura
<zfigura at codeweavers.com> wrote:
>
> From: Francisco Casas <fcasas at codeweavers.com>
>
> Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
> Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
> ---
> v5: Strip newlines from hlsl_fixme(), get rid of the as-yet-unused
> status_out_arg variable, expand the srcs[] array to have size 4, use sm4
> register helpers, minor stylistic tweaks.
>
>  libs/vkd3d-shader/hlsl.c     |  4 ++
>  libs/vkd3d-shader/hlsl.h     |  4 ++
>  libs/vkd3d-shader/hlsl.y     | 99 ++++++++++++++++++++++++++++++++++++
>  libs/vkd3d-shader/hlsl_sm4.c | 57 ++++++++++++++++++++-
>  4 files changed, 163 insertions(+), 1 deletion(-)
>
> diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
> index 26175008d..856fb0f9d 100644
> --- a/libs/vkd3d-shader/hlsl.c
> +++ b/libs/vkd3d-shader/hlsl.c
> @@ -1280,6 +1280,10 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru
>      {
>          [HLSL_RESOURCE_LOAD] = "load_resource",
>          [HLSL_RESOURCE_SAMPLE] = "sample",
> +        [HLSL_RESOURCE_GATHER_RED] = "gather_red",
> +        [HLSL_RESOURCE_GATHER_GREEN] = "gather_green",
> +        [HLSL_RESOURCE_GATHER_BLUE] = "gather_blue",
> +        [HLSL_RESOURCE_GATHER_ALPHA] = "gather_alpha",
>      };
>
>      vkd3d_string_buffer_printf(buffer, "%s(resource = ", type_names[load->load_type]);
> diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
> index 2396adb40..49fa8d9d3 100644
> --- a/libs/vkd3d-shader/hlsl.h
> +++ b/libs/vkd3d-shader/hlsl.h
> @@ -378,6 +378,10 @@ enum hlsl_resource_load_type
>  {
>      HLSL_RESOURCE_LOAD,
>      HLSL_RESOURCE_SAMPLE,
> +    HLSL_RESOURCE_GATHER_RED,
> +    HLSL_RESOURCE_GATHER_GREEN,
> +    HLSL_RESOURCE_GATHER_BLUE,
> +    HLSL_RESOURCE_GATHER_ALPHA,
>  };
>
>  struct hlsl_ir_resource_load
> diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
> index 9b1e5c071..460ba44bb 100644
> --- a/libs/vkd3d-shader/hlsl.y
> +++ b/libs/vkd3d-shader/hlsl.y
> @@ -1930,6 +1930,105 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
>          list_add_tail(instrs, &load->node.entry);
>          return true;
>      }
> +    else if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue")
> +            || !strcmp(name, "GatherGreen") || !strcmp(name, "GatherAlpha"))
> +    {
> +        const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim);
> +        enum hlsl_resource_load_type load_type;
> +        const struct hlsl_type *sampler_type;
> +        struct hlsl_ir_resource_load *load;
> +        struct hlsl_ir_node *offset = NULL;
> +        struct hlsl_ir_load *sampler_load;
> +        struct hlsl_type *result_type;
> +        struct hlsl_ir_node *coords;
> +        unsigned int read_channel;
> +
> +        if (!strcmp(name, "GatherGreen"))
> +        {
> +            load_type = HLSL_RESOURCE_GATHER_GREEN;
> +            read_channel = 1;
> +        }
> +        else if (!strcmp(name, "GatherBlue"))
> +        {
> +            load_type = HLSL_RESOURCE_GATHER_BLUE;
> +            read_channel = 2;
> +        }
> +        else if (!strcmp(name, "GatherAlpha"))
> +        {
> +            load_type = HLSL_RESOURCE_GATHER_ALPHA;
> +            read_channel = 3;
> +        }
> +        else
> +        {
> +            load_type = HLSL_RESOURCE_GATHER_RED;
> +            read_channel = 0;
> +        }
> +
> +        if (!strcmp(name, "Gather"))
> +        {
> +            if (params->args_count != 2 && params->args_count != 3)
> +            {
> +                hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
> +                        "Wrong number of arguments to method 'Gather': expected 2 or 3, but got %u.", params->args_count);
> +                return false;
> +            }
> +        }
> +        else if (params->args_count < 2 || params->args_count == 5 || params->args_count > 7)
> +        {
> +            hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
> +                    "Wrong number of arguments to method '%s': expected 2,3,4,6 or 7, but got %u.", name, params->args_count);

Nitpick, spacing after comma is inconsistent.

> +            return false;
> +        }
> +
> +        if (params->args_count == 4 || params->args_count == 7)
> +            hlsl_fixme(ctx, loc, "Tiled resource fully mapped status.");

Nitpick 2, this fixme message seems a bit obscure. It makes sense when
reading it word by word but it didn't quite work for me at a first
glance.
Maybe "Tiled resource status argument" or so? It's also okay to leave it as is.

> +
> +        if (params->args_count == 6 || params->args_count == 7)
> +            hlsl_fixme(ctx, loc, "Multiple Gather() offset parameters.");
> +
> +        if (params->args_count == 3 || params->args_count == 4)
> +        {
> +            if (!(offset = add_implicit_conversion(ctx, instrs, params->args[2],
> +                    hlsl_get_vector_type(ctx, HLSL_TYPE_INT, sampler_dim), loc)))
> +                return false;
> +        }
> +
> +        sampler_type = params->args[0]->data_type;
> +        if (sampler_type->type != HLSL_CLASS_OBJECT || sampler_type->base_type != HLSL_TYPE_SAMPLER
> +                || sampler_type->sampler_dim != HLSL_SAMPLER_DIM_GENERIC)
> +        {
> +            struct vkd3d_string_buffer *string;
> +
> +            if ((string = hlsl_type_to_string(ctx, sampler_type)))
> +                hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE,
> +                        "Wrong type for argument 0 of %s(): expected 'sampler', but got '%s'.", name, string->buffer);

I think usually one uses 1-based indices in this type of compiler messages.

> +            hlsl_release_string_buffer(ctx, string);
> +            return false;
> +        }
> +
> +        if (read_channel >= object_type->e.resource_format->dimx)
> +        {
> +            hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE,
> +                    "Method %s() requires at least %d channels.", name, read_channel + 1);

%u

I'll be resending this patch too so I can make those changes myself,
if there are no objections.