Module: vkd3d Branch: master Commit: fd0844e420f45e3aeedce5e18ff8904fdb3ad085 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd0844e420f45e3aeedce5e1... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 23 12:46:50 2019 +0100 vkd3d-shader: Avoid using private variables for depth output registers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 41 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 5 ++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 233b9b5..369ea92 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3567,6 +3567,40 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ } } +static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_dst_param *dst) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_register *reg = &dst->reg; + const struct vkd3d_spirv_builtin *builtin; + struct vkd3d_symbol reg_symbol; + uint32_t output_id; + + assert(!reg->idx[0].rel_addr); + assert(!reg->idx[1].rel_addr); + assert(reg->idx[1].offset == ~0u); + + if (!(builtin = get_spirv_builtin_for_register(reg->type))) + { + FIXME("Unhandled register %#x.\n", reg->type); + return; + } + + output_id = vkd3d_dxbc_compiler_emit_variable(compiler, + &builder->global_stream, SpvStorageClassOutput, + builtin->component_type, builtin->component_count); + vkd3d_spirv_add_iface_variable(builder, output_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, output_id, builtin->spirv_builtin); + + vkd3d_symbol_make_register(®_symbol, reg); + reg_symbol.id = output_id; + reg_symbol.info.reg.storage_class = SpvStorageClassOutput; + reg_symbol.info.reg.component_type = builtin->component_type; + reg_symbol.info.reg.write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); + vkd3d_dxbc_compiler_put_symbol(compiler, ®_symbol); + vkd3d_dxbc_compiler_emit_register_debug_name(builder, output_id, reg); +} + static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -4386,7 +4420,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_input_sysval(struct vkd3d_dxbc_compiler static void vkd3d_dxbc_compiler_emit_dcl_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - vkd3d_dxbc_compiler_emit_output(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE); + const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; + + if (vkd3d_shader_register_is_output(&dst->reg)) + vkd3d_dxbc_compiler_emit_output(compiler, dst, VKD3D_SIV_NONE); + else + vkd3d_dxbc_compiler_emit_output_register(compiler, dst); } static void vkd3d_dxbc_compiler_emit_dcl_output_siv(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 2942a34..e08f1f3 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -784,6 +784,11 @@ static inline bool vkd3d_shader_register_is_input(const struct vkd3d_shader_regi return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT; } +static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_register *reg) +{ + return reg->type == VKD3DSPR_OUTPUT || reg->type == VKD3DSPR_COLOROUT; +} + void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size,