Isabella Bosia : vkd3d-shader: Implement target type d3d asm.
Alexandre Julliard
julliard at winehq.org
Fri Sep 25 14:50:22 CDT 2020
Module: vkd3d
Branch: master
Commit: f494abde8999acb849879eeeaede458a19a933d8
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f494abde8999acb849879eeeaede458a19a933d8
Author: Isabella Bosia <ibosia at codeweavers.com>
Date: Fri Sep 25 02:26:38 2020 +0100
vkd3d-shader: Implement target type d3d asm.
Signed-off-by: Isabella Bosia <ibosia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/vkd3d_shader.h | 1 +
libs/vkd3d-shader/vkd3d_shader_main.c | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 3efd355..0eead7c 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -466,6 +466,7 @@ enum vkd3d_shader_target_type
*/
VKD3D_SHADER_TARGET_SPIRV_BINARY,
VKD3D_SHADER_TARGET_SPIRV_TEXT,
+ VKD3D_SHADER_TARGET_D3D_ASM,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET_TYPE),
};
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index ea1a700..0839cae 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -338,6 +338,13 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info,
vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source);
+ if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM)
+ {
+ ret = vkd3d_dxbc_binary_to_text(parser.data, out);
+ vkd3d_shader_parser_destroy(&parser);
+ goto done;
+ }
+
if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version,
&parser.shader_desc, compile_info, &scan_descriptor_info, &message_context)))
{
@@ -1074,6 +1081,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types(
#ifdef HAVE_SPIRV_TOOLS
VKD3D_SHADER_TARGET_SPIRV_TEXT,
#endif
+ VKD3D_SHADER_TARGET_D3D_ASM,
};
TRACE("source_type %#x, count %p.\n", source_type, count);
More information about the wine-cvs
mailing list