Henri Verbeet : vkd3d-shader: Use the (potentially) modified write mask as dcl_mask in vkd3d_dxbc_compiler_emit_output().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 3b4b898cc5501d081510ec241088ccb41ddb21d8
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=3b4b898cc5501d081510ec24...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Mon Mar 22 13:20:03 2021 +0100

vkd3d-shader: Use the (potentially) modified write mask as dcl_mask in vkd3d_dxbc_compiler_emit_output().

When outputs are coalesced, the write mask is modified by
needs_private_io_variable(). We want the "dcl_mask" field to reflect
that as well.

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

---

 libs/vkd3d-shader/spirv.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 4598ffa..d9bfa09 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -4702,20 +4702,14 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler
 
     storage_class = SpvStorageClassOutput;
 
-    if ((use_private_variable = builtin && builtin->spirv_array_size))
-        write_mask = VKD3DSP_WRITEMASK_ALL;
-    else if (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE
+    if (!(use_private_variable = builtin && builtin->spirv_array_size)
+            && (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE
             || needs_private_io_variable(shader_signature, signature_element->register_index,
                     builtin, &output_component_count, &write_mask)
-            || is_patch_constant)
-    {
+            || is_patch_constant))
         use_private_variable = true;
-        write_mask = VKD3DSP_WRITEMASK_ALL;
-    }
     else
-    {
         component_idx = vkd3d_write_mask_get_component_idx(write_mask);
-    }
 
     vkd3d_symbol_make_register(®_symbol, reg);
 
@@ -4725,16 +4719,13 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler
         id = symbol->id;
     }
 
-    if (!symbol || ~symbol->info.reg.dcl_mask & signature_element->mask)
+    if (!symbol || ~symbol->info.reg.dcl_mask & write_mask)
     {
         if (compiler->output_info[signature_idx].id)
         {
             id = compiler->output_info[signature_idx].id;
             if (compiler->output_info[signature_idx].array_element_mask)
-            {
                 use_private_variable = true;
-                write_mask = VKD3DSP_WRITEMASK_ALL;
-            }
         }
         else if (builtin)
         {
@@ -4795,7 +4786,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler
                     storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE);
 
         vkd3d_symbol_set_register_info(®_symbol, var_id, storage_class,
-                use_private_variable ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, write_mask);
+                use_private_variable ? VKD3D_SHADER_COMPONENT_FLOAT : component_type,
+                use_private_variable ? VKD3DSP_WRITEMASK_ALL : write_mask);
         reg_symbol.info.reg.is_aggregate = use_private_variable ? is_patch_constant : array_size;
         if (!use_private_variable && is_control_point_phase(phase))
         {
@@ -4806,7 +4798,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler
         {
             reg_symbol.info.reg.member_idx = reg->idx[0].offset;
         }
-        reg_symbol.info.reg.dcl_mask = signature_element->mask;
+        reg_symbol.info.reg.dcl_mask = write_mask;
 
         vkd3d_dxbc_compiler_put_symbol(compiler, ®_symbol);
 
@@ -4815,7 +4807,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler
     }
     else
     {
-        symbol->info.reg.dcl_mask |= signature_element->mask;
+        symbol->info.reg.dcl_mask |= write_mask;
         var_id = symbol->id;
     }