vkd3d-shader: Allow vkd3d_shader_compile_dxbc() to handle multiple source types.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet
2020-06-19 16:13:36 +04:30
committed by Alexandre Julliard
parent b07c304440
commit d6ec017077
6 changed files with 46 additions and 15 deletions

View File

@@ -1350,10 +1350,11 @@ static HRESULT create_shader_stage(struct d3d12_device *device,
compile_info.next = shader_interface;
compile_info.source.code = code->pShaderBytecode;
compile_info.source.size = code->BytecodeLength;
compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF;
compile_info.options = NULL;
compile_info.option_count = 0;
if ((ret = vkd3d_shader_compile_dxbc(&compile_info, &spirv)) < 0)
if ((ret = vkd3d_shader_compile(&compile_info, &spirv)) < 0)
{
WARN("Failed to compile shader, vkd3d result %d.\n", ret);
return hresult_from_vkd3d_result(ret);