[PATCH vkd3d 3/5] vkd3d-shader/hlsl: Write bound resources into the RDEF table.

[Matteo Bruni]

On Tue, Oct 12, 2021 at 4:59 AM Zebediah Figura <zfigura at codeweavers.com> wrote:
>
> Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
> ---
>  include/vkd3d_d3dcommon.idl  |  28 +++++++++
>  libs/vkd3d-shader/hlsl_sm4.c | 116 +++++++++++++++++++++++++++++++++--
>  2 files changed, 140 insertions(+), 4 deletions(-)

I have just a tiny nit for this one.

> diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
> index 6efff09f0..9b212227f 100644
> --- a/libs/vkd3d-shader/hlsl_sm4.c
> +++ b/libs/vkd3d-shader/hlsl_sm4.c

> @@ -470,6 +537,37 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc)
>
>      resources_offset = bytecode_get_size(&buffer);
>      set_u32(&buffer, resource_position, resources_offset);
> +
> +    LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry)
> +    {
> +        uint32_t flags = 0;
> +
> +        if (!var->reg.allocated || var->data_type->type != HLSL_CLASS_OBJECT)
> +            continue;
> +
> +        if (var->reg_reservation.type)
> +            flags |= D3D_SIF_USERPACKED;
> +
> +        put_u32(&buffer, 0); /* name */
> +        put_u32(&buffer, sm4_resource_type(var->data_type));
> +        if (var->data_type->base_type == HLSL_TYPE_SAMPLER)
> +        {
> +            put_u32(&buffer, 0);
> +            put_u32(&buffer, 0);
> +            put_u32(&buffer, 0);
> +        }
> +        else
> +        {
> +            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;

Ideally we would have a VKD3D_SM4_FLAGS_TEXTURE_DIM_SHIFT define or
something instead of a plain 2 here.