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

libs/vkd3d-shader: Use component types from output signatures for shader outputs.

Browse Source 
Fixes Vulkan validation layers errors.
This commit is contained in:
Józef Kucia 2017-07-25 14:23:27 +02:00
parent 97e79e28cf
commit 5a2ebc62f6
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2153,23 +2153,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp
bool use_private_variable; bool use_private_variable;
uint32_t id, var_id; uint32_t id, var_id;
builtin = vkd3d_get_spirv_builtin(dst->reg.type, sysval);
component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask);
component_count = vkd3d_write_mask_component_count(dst->write_mask);
if (builtin)
{
component_type = builtin->component_type;
output_component_count = builtin->component_count;
}
else
{
/* FIXME: Consider output signature when choosing component type for output variable. */
component_type = VKD3D_TYPE_FLOAT;
output_component_count = component_count;
}
assert(component_count <= output_component_count);
signature_element = NULL; signature_element = NULL;
signature = compiler->output_signature; signature = compiler->output_signature;
for (signature_idx = 0; signature_idx < signature->element_count; ++signature_idx) for (signature_idx = 0; signature_idx < signature->element_count; ++signature_idx)
@ -2187,6 +2170,22 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp
reg->idx[0].offset, dst->write_mask); reg->idx[0].offset, dst->write_mask);
} }
builtin = vkd3d_get_spirv_builtin(dst->reg.type, sysval);
component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask);
component_count = vkd3d_write_mask_component_count(dst->write_mask);
if (builtin)
{
component_type = builtin->component_type;
output_component_count = builtin->component_count;
}
else
{
component_type = signature_element ? signature_element->component_type : VKD3D_TYPE_FLOAT;
output_component_count = component_count;
}
assert(component_count <= output_component_count);
storage_class = SpvStorageClassOutput; storage_class = SpvStorageClassOutput;
id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream,
storage_class, component_type, component_count); storage_class, component_type, component_count);