[PATCH vkd3d v2 3/5] vkd3d-shader: Advertise support for compiling HLSL to DXBC_TPF.
Zebediah Figura
zfigura at codeweavers.com
Fri Sep 25 16:41:23 CDT 2020
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
include/vkd3d_shader.h | 7 ++
libs/vkd3d-shader/vkd3d_shader_main.c | 94 ++++++++++++++++++---------
2 files changed, 71 insertions(+), 30 deletions(-)
diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 204ddcc2..a30ed41b 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -461,6 +461,8 @@ enum vkd3d_shader_source_type
* the format used for Direct3D shader model 4 and 5 shaders.
*/
VKD3D_SHADER_SOURCE_DXBC_TPF,
+ /** High-Level Shader Language source code. */
+ VKD3D_SHADER_SOURCE_HLSL,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SOURCE_TYPE),
};
@@ -479,6 +481,11 @@ enum vkd3d_shader_target_type
*/
VKD3D_SHADER_TARGET_SPIRV_BINARY,
VKD3D_SHADER_TARGET_SPIRV_TEXT,
+ /**
+ * A 'Tokenized Program Format' shader embedded in a DXBC container. This is
+ * the format used for Direct3D shader model 4 and 5 shaders.
+ */
+ VKD3D_SHADER_TARGET_DXBC_TPF,
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 762026b5..69ce5a02 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -839,58 +839,43 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char
return ret;
}
-int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info,
- struct vkd3d_shader_code *out, char **messages)
+static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info,
+ struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context)
{
struct vkd3d_shader_scan_descriptor_info scan_descriptor_info;
- struct vkd3d_shader_message_context message_context;
struct vkd3d_shader_instruction instruction;
struct vkd3d_shader_compile_info scan_info;
struct vkd3d_dxbc_compiler *spirv_compiler;
struct vkd3d_shader_parser parser;
int ret;
- TRACE("compile_info %p, out %p, messages %p.\n", compile_info, out, messages);
-
- if (messages)
- *messages = NULL;
-
- if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0)
- return ret;
-
- if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name))
- return VKD3D_ERROR;
-
scan_info = *compile_info;
scan_descriptor_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO;
scan_descriptor_info.next = scan_info.next;
scan_info.next = &scan_descriptor_info;
- if ((ret = scan_dxbc(&scan_info, &message_context)) < 0)
+ if ((ret = scan_dxbc(&scan_info, message_context)) < 0)
+ return ret;
+
+ if ((ret = vkd3d_shader_parser_init(&parser, &compile_info->source, message_context)) < 0)
{
- vkd3d_shader_message_context_trace_messages(&message_context);
- if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context)))
- ret = VKD3D_ERROR_OUT_OF_MEMORY;
- vkd3d_shader_message_context_cleanup(&message_context);
+ vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info);
return ret;
}
- if ((ret = vkd3d_shader_parser_init(&parser, &compile_info->source, &message_context)) < 0)
- goto done;
-
vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source);
if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version,
- &parser.shader_desc, compile_info, &scan_descriptor_info, &message_context)))
+ &parser.shader_desc, compile_info, &scan_descriptor_info, message_context)))
{
ERR("Failed to create DXBC compiler.\n");
vkd3d_shader_parser_destroy(&parser);
- ret = VKD3D_ERROR;
- goto done;
+ vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info);
+ return VKD3D_ERROR;
}
- message_context.line = 2; /* Line 1 is the version token. */
- message_context.column = 1;
+ message_context->line = 2; /* Line 1 is the version token. */
+ message_context->column = 1;
while (!shader_sm4_is_end(parser.data, &parser.ptr))
{
shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction);
@@ -904,7 +889,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info,
if ((ret = vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction)) < 0)
break;
- ++message_context.line;
+ ++message_context->line;
}
if (ret >= 0)
@@ -912,12 +897,51 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info,
vkd3d_dxbc_compiler_destroy(spirv_compiler);
vkd3d_shader_parser_destroy(&parser);
-done:
+ vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info);
+ return ret;
+}
+
+static int compile_hlsl(const struct vkd3d_shader_compile_info *compile_info,
+ struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context)
+{
+ return VKD3D_ERROR_NOT_IMPLEMENTED;
+}
+
+int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info,
+ struct vkd3d_shader_code *out, char **messages)
+{
+ struct vkd3d_shader_message_context message_context;
+ int ret;
+
+ TRACE("compile_info %p, out %p, messages %p.\n", compile_info, out, messages);
+
+ if (messages)
+ *messages = NULL;
+
+ if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0)
+ return ret;
+
+ if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name))
+ return VKD3D_ERROR;
+
+ switch (compile_info->source_type)
+ {
+ case VKD3D_SHADER_SOURCE_DXBC_TPF:
+ ret = compile_dxbc_tpf(compile_info, out, &message_context);
+ break;
+
+ case VKD3D_SHADER_SOURCE_HLSL:
+ ret = compile_hlsl(compile_info, out, &message_context);
+ break;
+
+ default:
+ assert(0);
+ }
+
vkd3d_shader_message_context_trace_messages(&message_context);
if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context)))
ret = VKD3D_ERROR_OUT_OF_MEMORY;
vkd3d_shader_message_context_cleanup(&message_context);
- vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info);
return ret;
}
@@ -1066,6 +1090,7 @@ const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(uns
static const enum vkd3d_shader_source_type types[] =
{
VKD3D_SHADER_SOURCE_DXBC_TPF,
+ VKD3D_SHADER_SOURCE_HLSL,
};
TRACE("count %p.\n", count);
@@ -1085,6 +1110,11 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types(
#endif
};
+ static const enum vkd3d_shader_target_type hlsl_types[] =
+ {
+ VKD3D_SHADER_TARGET_DXBC_TPF,
+ };
+
TRACE("source_type %#x, count %p.\n", source_type, count);
switch (source_type)
@@ -1093,6 +1123,10 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types(
*count = ARRAY_SIZE(dxbc_tpf_types);
return dxbc_tpf_types;
+ case VKD3D_SHADER_SOURCE_HLSL:
+ *count = ARRAY_SIZE(hlsl_types);
+ return hlsl_types;
+
default:
*count = 0;
return NULL;
--
2.28.0
More information about the wine-devel
mailing list