Francisco Casas : vkd3d-shader/spirv: Use vsir_register_init() in spirv_compiler_emit_sampler_declaration().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 314c6e480822359f170618b6e2f8afc766fab6a0
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/314c6e480822359f170618b6e2f8af...

Author: Francisco Casas <fcasas(a)codeweavers.com>
Date:   Tue Sep  5 12:20:52 2023 -0300

vkd3d-shader/spirv: Use vsir_register_init() in spirv_compiler_emit_sampler_declaration().

---

 libs/vkd3d-shader/spirv.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index d0813dd7..f9ffd709 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -5706,15 +5706,12 @@ static void spirv_compiler_emit_sampler_declaration(struct spirv_compiler *compi
     const SpvStorageClass storage_class = SpvStorageClassUniformConstant;
     struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
     struct vkd3d_descriptor_variable_info var_info;
+    struct vkd3d_shader_register reg;
     struct vkd3d_symbol reg_symbol;
     uint32_t type_id, var_id;
 
-    const struct vkd3d_shader_register reg =
-    {
-        .type = VKD3DSPR_SAMPLER,
-        .idx[0].offset = register_id,
-        .idx_count = 1,
-    };
+    vsir_register_init(®, VKD3DSPR_SAMPLER, VKD3D_DATA_FLOAT, 1);
+    reg.idx[0].offset = register_id;
 
     vkd3d_symbol_make_sampler(®_symbol, ®);
     reg_symbol.info.sampler.range = *range;