Signed-off-by: Henri Verbeet hverbeet@codeweavers.com --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index a5a3498..3bd9ce5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -559,7 +559,7 @@ struct vkd3d_shader_root_parameter1 enum vkd3d_shader_visibility shader_visibility; };
-struct vkd3d_root_signature_desc1 +struct vkd3d_shader_root_signature_desc1 { unsigned int parameter_count; const struct vkd3d_shader_root_parameter1 *parameters; @@ -582,7 +582,7 @@ struct vkd3d_versioned_root_signature_desc union { struct vkd3d_shader_root_signature_desc v_1_0; - struct vkd3d_root_signature_desc1 v_1_1; + struct vkd3d_shader_root_signature_desc1 v_1_1; } u; };
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1be733a..dd57287 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2606,7 +2606,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size, } else { - struct vkd3d_root_signature_desc1 *v_1_1 = &desc->u.v_1_1; + struct vkd3d_shader_root_signature_desc1 *v_1_1 = &desc->u.v_1_1;
assert(version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_1);
@@ -3262,7 +3262,7 @@ fail: static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_desc *dst, const struct vkd3d_versioned_root_signature_desc *src) { - const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; + const struct vkd3d_shader_root_signature_desc1 *src_desc = &src->u.v_1_1; struct vkd3d_shader_root_signature_desc *dst_desc = &dst->u.v_1_0; struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_shader_root_parameter *parameters = NULL; @@ -3384,7 +3384,7 @@ static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_ const struct vkd3d_versioned_root_signature_desc *src) { const struct vkd3d_shader_root_signature_desc *src_desc = &src->u.v_1_0; - struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1; + struct vkd3d_shader_root_signature_desc1 *dst_desc = &dst->u.v_1_1; struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_shader_root_parameter1 *parameters = NULL; int ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 80dbda1..b40d2b4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -495,7 +495,7 @@ static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_shader_root_sign memset(root_signature, 0, sizeof(*root_signature)); }
-static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_root_signature_desc1 *root_signature) +static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_shader_root_signature_desc1 *root_signature) { unsigned int i;