[PATCH vkd3d 03/11] vkd3d-shader: Don't redundantly override shader output info.

[Conor McCarthy]

Hi Philip,

This causes a crash in the vkd3d tests, after line 28451 in tests/d3d12.c,
when combined with only the preceding patch or the complete set.
libs/vkd3d-shader/spirv.c:1638: vkd3d_spirv_get_type_id: Assertion
`component_type != VKD3D_TYPE_VOID' failed.

On Thu, Oct 17, 2019 at 6:36 AM Philip Rebohle <
philip.rebohle at tu-dortmund.de> wrote:

> Signed-off-by: Philip Rebohle <philip.rebohle at tu-dortmund.de>
> ---
>  libs/vkd3d-shader/spirv.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
> index 1598ae0..9b8da57 100644
> --- a/libs/vkd3d-shader/spirv.c
> +++ b/libs/vkd3d-shader/spirv.c
> @@ -4381,10 +4381,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct
> vkd3d_dxbc_compiler *compiler
>              vkd3d_spirv_build_op_decorate(builder, id,
> SpvDecorationPatch, NULL, 0);
>
>          vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id,
> output_component_count, signature_element);
> -    }
>
> -    compiler->output_info[signature_idx].id = id;
> -    compiler->output_info[signature_idx].component_type = component_type;
> +        compiler->output_info[signature_idx].id = id;
> +        compiler->output_info[signature_idx].component_type =
> component_type;
> +    }
>
>      if (use_private_variable)
>          storage_class = SpvStorageClassPrivate;
> --
> 2.23.0
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20191023/0c4260c6/attachment-0001.htm>