Francisco Casas : vkd3d-shader/tpf: Put the actual bind count in the RDEF table.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 81afe4356904be6bbefb961a12973be4b94c9135
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/81afe4356904be6bbefb961a12973b...

Author: Francisco Casas 
Date:   Thu Aug  3 21:02:11 2023 -0400

vkd3d-shader/tpf: Put the actual bind count in the RDEF table.

---

libs/vkd3d-shader/hlsl.h         | 3 +++
 libs/vkd3d-shader/hlsl_codegen.c | 2 ++
 libs/vkd3d-shader/tpf.c          | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index f670aa32..75a1e6e4 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -417,6 +417,9 @@ struct hlsl_ir_var
         enum hlsl_sampler_dim sampler_dim;
         struct vkd3d_shader_location first_sampler_dim_loc;
     } *objects_usage[HLSL_REGSET_LAST_OBJECT + 1];
+    /* Minimum number of binds required to include all object components actually used in the shader.
+     * It may be less than the allocation size, e.g. for texture arrays. */
+    unsigned int bind_count[HLSL_REGSET_LAST_OBJECT + 1];

uint32_t is_input_semantic : 1;
     uint32_t is_output_semantic : 1;
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 884fe68e..9c1c96ae 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -3275,6 +3275,7 @@ static bool track_object_components_usage(struct hlsl_ctx *ctx, struct hlsl_ir_n
         return false;

var->objects_usage[regset][index].used = true;
+    var->bind_count[regset] = max(var->bind_count[regset], index + 1);
     if (load->sampler.var)
     {
         var = load->sampler.var;
@@ -3282,6 +3283,7 @@ static bool track_object_components_usage(struct hlsl_ctx *ctx, struct hlsl_ir_n
             return false;

var->objects_usage[HLSL_REGSET_SAMPLERS][index].used = true;
+        var->bind_count[HLSL_REGSET_SAMPLERS] = max(var->bind_count[HLSL_REGSET_SAMPLERS], index + 1);
     }

return false;
diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c
index 04cd1fed..550f9b27 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -3192,7 +3192,7 @@ static struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, un

extern_resources[*count].regset = regset;
             extern_resources[*count].id = var->regs[regset].id;
-            extern_resources[*count].bind_count = var->regs[regset].allocation_size;
+            extern_resources[*count].bind_count = var->bind_count[regset];

++*count;
         }