[PATCH vkd3d 3/5] vkd3d-shader: Create descriptor array symbols for samplers.

[Conor McCarthy]

Signed-off-by: Conor McCarthy 
---
 libs/vkd3d-shader/spirv.c | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 25936849..945ccfef 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -5501,8 +5501,11 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com
     const SpvStorageClass storage_class = SpvStorageClassUniformConstant;
     struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
     const struct vkd3d_shader_register *reg = &sampler->src.reg;
-    uint32_t type_id, ptr_type_id, var_id;
+    struct vkd3d_shader_descriptor_binding binding;
+    const struct vkd3d_symbol *array_symbol;
     struct vkd3d_symbol reg_symbol;
+    unsigned int binding_base_idx;
+    uint32_t type_id, var_id;

vkd3d_symbol_make_sampler(&reg_symbol, reg);
     reg_symbol.info.sampler.range = sampler->range;
@@ -5511,19 +5514,17 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com
     if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, sampler))
         return;

-    type_id = vkd3d_spirv_get_op_type_sampler(builder);
-    ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id);
-    var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream,
-            ptr_type_id, storage_class, 0);
+    binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, &sampler->range,
+            VKD3D_SHADER_RESOURCE_NONE, false, &binding_base_idx);

-    vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg,
-            &sampler->range, VKD3D_SHADER_RESOURCE_NONE, false);
-
-    vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg);
+    type_id = vkd3d_spirv_get_op_type_sampler(builder);
+    var_id = vkd3d_dxbc_compiler_build_resource_variable(compiler, storage_class, type_id, reg,
+            &binding, binding_base_idx, binding.count != 1 || sampler->range.last == ~0u, &array_symbol);

vkd3d_symbol_make_register(&reg_symbol, reg);
     vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class,
             VKD3D_SHADER_COMPONENT_FLOAT, VKD3DSP_WRITEMASK_ALL);
+    reg_symbol.descriptor_array = array_symbol;
     vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol);
 }

@@ -7821,10 +7822,24 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil

if (sampled)
     {
+        struct vkd3d_shader_register_info register_info;
+
         assert(image->image_id);
         assert(sampler_reg);

-        sampler_var_id = vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg);
+        if (!vkd3d_dxbc_compiler_get_register_info(compiler, sampler_reg, &register_info))
+            ERR("Failed to get sampler register info.\n");
+        sampler_var_id = register_info.id;
+        if (register_info.descriptor_array)
+        {
+            const struct vkd3d_symbol_descriptor_array_data *array_data
+                    = &register_info.descriptor_array->info.descriptor_array;
+            uint32_t ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder,
+                    register_info.storage_class, array_data->contained_type_id);
+            uint32_t array_idx = vkd3d_dxbc_compiler_get_resource_index(compiler,
+                    sampler_reg, array_data->binding_base_idx, VKD3D_SHADER_RESOURCE_NONE);
+            sampler_var_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, register_info.id, &array_idx, 1);
+        }

sampler_id = vkd3d_spirv_build_op_load(builder,
                 vkd3d_spirv_get_op_type_sampler(builder), sampler_var_id, SpvMemoryAccessMaskNone);