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

@@ -226,6 +226,14 @@ struct vkd3d_shader_transform_feedback_info
unsigned int buffer_stride_count;
};
enum vkd3d_shader_source_type
{
VKD3D_SHADER_SOURCE_NONE,
VKD3D_SHADER_SOURCE_DXBC_TPF,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SOURCE_TYPE),
};
struct vkd3d_shader_compile_info
{
enum vkd3d_shader_structure_type type;
@@ -233,6 +241,8 @@ struct vkd3d_shader_compile_info
struct vkd3d_shader_code source;
enum vkd3d_shader_source_type source_type;
const struct vkd3d_shader_compile_option *options;
unsigned int option_count;
};
@@ -653,7 +663,7 @@ struct vkd3d_shader_signature
#ifndef VKD3D_SHADER_NO_PROTOTYPES
int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv);
int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv);
void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code);
int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc,
@@ -682,7 +692,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature
/*
* Function pointer typedefs for vkd3d-shader functions.
*/
typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_compile_info *compile_info,
typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_code *spirv);
typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code);