wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Rename the vkd3d_root_signature_desc1 structure to vkd3d_shader_root_signature_desc1.

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2020-07-22 15:54:11 +04:30 committed by Alexandre Julliard
parent 0f0f2b331e
commit 823e356460
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vkd3d_shader.h
View File

@ -559,7 +559,7 @@ struct vkd3d_shader_root_parameter1
enum vkd3d_shader_visibility shader_visibility; enum vkd3d_shader_visibility shader_visibility;
}; };
struct vkd3d_root_signature_desc1 struct vkd3d_shader_root_signature_desc1
{ {
unsigned int parameter_count; unsigned int parameter_count;
const struct vkd3d_shader_root_parameter1 *parameters; const struct vkd3d_shader_root_parameter1 *parameters;
@ -582,7 +582,7 @@ struct vkd3d_versioned_root_signature_desc
union union
{ {
struct vkd3d_shader_root_signature_desc v_1_0; 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; } u;
}; };

6
libs/vkd3d-shader/dxbc.c
View File

@ -2606,7 +2606,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size,
} }
else 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); 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, 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_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_root_signature_desc *dst_desc = &dst->u.v_1_0;
struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_shader_static_sampler_desc *samplers = NULL;
struct vkd3d_shader_root_parameter *parameters = 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_versioned_root_signature_desc *src)
{ {
const struct vkd3d_shader_root_signature_desc *src_desc = &src->u.v_1_0; 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_static_sampler_desc *samplers = NULL;
struct vkd3d_shader_root_parameter1 *parameters = NULL; struct vkd3d_shader_root_parameter1 *parameters = NULL;
int ret; int ret;

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

@ -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)); 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; unsigned int i;