wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Allow compiling d3d bytecode to SPIR-V.

Browse Source
This commit is contained in:
Zebediah Figura
2022-03-12 16:57:27 -06:00
committed by Alexandre Julliard
parent 6a514ebe8e
commit 4ff389854c
Notes: Alexandre Julliard 2023-12-14 23:31:52 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/518
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/vkd3d-shader/vkd3d_shader_main.c
View File

@@ -1626,14 +1626,10 @@ static int compile_d3d_bytecode(const struct vkd3d_shader_compile_info *compile_
return ret; return ret;
} }
if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) ret = vkd3d_shader_parser_compile(parser, compile_info, out, message_context);
{
ret = vkd3d_dxbc_binary_to_text(&parser->instructions, &parser->shader_version, compile_info, out, VSIR_ASM_D3D);
vkd3d_shader_parser_destroy(parser);
return ret;
}
return VKD3D_ERROR; vkd3d_shader_parser_destroy(parser);
return ret;
} }
static int compile_dxbc_dxil(const struct vkd3d_shader_compile_info *compile_info, static int compile_dxbc_dxil(const struct vkd3d_shader_compile_info *compile_info,
@@ -1911,6 +1907,10 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types(
static const enum vkd3d_shader_target_type d3dbc_types[] = static const enum vkd3d_shader_target_type d3dbc_types[] =
{ {
VKD3D_SHADER_TARGET_SPIRV_BINARY,
#ifdef HAVE_SPIRV_TOOLS
VKD3D_SHADER_TARGET_SPIRV_TEXT,
#endif
VKD3D_SHADER_TARGET_D3D_ASM, VKD3D_SHADER_TARGET_D3D_ASM,
}; };