wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2021-03-22 13:20:03 +01:00 committed by Alexandre Julliard
parent b584668a81
commit 3b4b898cc5
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libs/vkd3d-shader/spirv.c
View File

@ -4702,20 +4702,14 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler
storage_class = SpvStorageClassOutput; storage_class = SpvStorageClassOutput;
if ((use_private_variable = builtin && builtin->spirv_array_size)) if (!(use_private_variable = builtin && builtin->spirv_array_size)
write_mask = VKD3DSP_WRITEMASK_ALL; && (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE
else if (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE
|| needs_private_io_variable(shader_signature, signature_element->register_index, || needs_private_io_variable(shader_signature, signature_element->register_index,
builtin, &output_component_count, &write_mask) builtin, &output_component_count, &write_mask)
|| is_patch_constant) || is_patch_constant))
{
use_private_variable = true; use_private_variable = true;
write_mask = VKD3DSP_WRITEMASK_ALL;
}
else else
{
component_idx = vkd3d_write_mask_get_component_idx(write_mask); component_idx = vkd3d_write_mask_get_component_idx(write_mask);
}
vkd3d_symbol_make_register(&reg_symbol, reg); vkd3d_symbol_make_register(&reg_symbol, reg);
@ -4725,16 +4719,13 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler
id = symbol->id; 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) if (compiler->output_info[signature_idx].id)
{ {
id = compiler->output_info[signature_idx].id; id = compiler->output_info[signature_idx].id;
if (compiler->output_info[signature_idx].array_element_mask) if (compiler->output_info[signature_idx].array_element_mask)
{
use_private_variable = true; use_private_variable = true;
write_mask = VKD3DSP_WRITEMASK_ALL;
}
} }
else if (builtin) 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); storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE);
vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, vkd3d_symbol_set_register_info(&reg_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; reg_symbol.info.reg.is_aggregate = use_private_variable ? is_patch_constant : array_size;
if (!use_private_variable && is_control_point_phase(phase)) 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.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, &reg_symbol); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol);
@ -4815,7 +4807,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler
} }
else else
{ {
symbol->info.reg.dcl_mask |= signature_element->mask; symbol->info.reg.dcl_mask |= write_mask;
var_id = symbol->id; var_id = symbol->id;
} }