Henri Verbeet : vkd3d-shader: Use proper variables for epilogue arguments.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 5e523cedca074e546a4125afa72a533234f3b30b
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=5e523cedca074e546a4125af...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Fri Sep  4 20:49:17 2020 +0430

vkd3d-shader: Use proper variables for epilogue arguments.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

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

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 9a6b632..ec6987b 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -6946,14 +6946,22 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(struct vkd3d_dxb
         {
             if (compiler->private_output_variable[i])
             {
+                uint32_t argument_id = compiler->private_output_variable[i];
                 unsigned int argument_idx = count++;
-                arguments[argument_idx] = compiler->private_output_variable[i];
 
                 if (compiler->private_output_variable_array_idx[i])
                 {
-                    arguments[argument_idx] = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id,
-                            arguments[argument_idx], compiler->private_output_variable_array_idx[i]);
+                    uint32_t tmp_id;
+
+                    tmp_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id,
+                            argument_id, compiler->private_output_variable_array_idx[i]);
+                    tmp_id = vkd3d_spirv_build_op_load(builder, type_id, tmp_id, SpvMemoryAccessMaskNone);
+                    argument_id = vkd3d_spirv_build_op_variable(builder,
+                            &builder->global_stream, ptr_type_id, SpvStorageClassPrivate, 0);
+                    vkd3d_spirv_build_op_store(builder, argument_id, tmp_id, SpvMemoryAccessMaskNone);
                 }
+
+                arguments[argument_idx] = argument_id;
             }
         }