wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Rename the vkd3d_root_signature_desc structure to vkd3d_shader_root_signature_desc.

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-21 15:20:03 +04:30 committed by Alexandre Julliard
parent 0056fc7046
commit 0f0f2b331e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vkd3d_shader.h
View File

@ -493,7 +493,7 @@ enum vkd3d_shader_root_signature_flags
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_SIGNATURE_FLAGS), VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_SIGNATURE_FLAGS),
}; };
struct vkd3d_root_signature_desc struct vkd3d_shader_root_signature_desc
{ {
unsigned int parameter_count; unsigned int parameter_count;
const struct vkd3d_shader_root_parameter *parameters; const struct vkd3d_shader_root_parameter *parameters;
@ -581,7 +581,7 @@ struct vkd3d_versioned_root_signature_desc
enum vkd3d_shader_root_signature_version version; enum vkd3d_shader_root_signature_version version;
union union
{ {
struct vkd3d_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_root_signature_desc1 v_1_1;
} u; } u;
}; };

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

@ -2563,7 +2563,7 @@ static int shader_parse_static_samplers(struct root_signature_parser_context *co
static int shader_parse_root_signature(const char *data, unsigned int data_size, static int shader_parse_root_signature(const char *data, unsigned int data_size,
struct vkd3d_versioned_root_signature_desc *desc) struct vkd3d_versioned_root_signature_desc *desc)
{ {
struct vkd3d_root_signature_desc *v_1_0 = &desc->u.v_1_0; struct vkd3d_shader_root_signature_desc *v_1_0 = &desc->u.v_1_0;
struct root_signature_parser_context context; struct root_signature_parser_context context;
unsigned int count, offset, version; unsigned int count, offset, version;
const char *ptr = data; const char *ptr = data;
@ -3263,7 +3263,7 @@ static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_
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_root_signature_desc1 *src_desc = &src->u.v_1_1;
struct vkd3d_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;
int ret; int ret;
@ -3383,7 +3383,7 @@ fail:
static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_desc *dst, static int convert_root_signature_to_v1_1(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_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_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;

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

@ -478,7 +478,7 @@ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code)
vkd3d_free((void *)shader_code->code); vkd3d_free((void *)shader_code->code);
} }
static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *root_signature) static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_shader_root_signature_desc *root_signature)
{ {
unsigned int i; unsigned int i;

4
libs/vkd3d/vkd3d_main.c
View File

@ -92,7 +92,7 @@ struct d3d12_root_signature_deserializer
} desc; } desc;
}; };
STATIC_ASSERT(sizeof(D3D12_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_root_signature_desc)); STATIC_ASSERT(sizeof(D3D12_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_shader_root_signature_desc));
static struct d3d12_root_signature_deserializer *impl_from_ID3D12RootSignatureDeserializer( static struct d3d12_root_signature_deserializer *impl_from_ID3D12RootSignatureDeserializer(
ID3D12RootSignatureDeserializer *iface) ID3D12RootSignatureDeserializer *iface)
@ -564,7 +564,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc,
*error_blob = NULL; *error_blob = NULL;
vkd3d_desc.version = VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0; vkd3d_desc.version = VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0;
vkd3d_desc.u.v_1_0 = *(const struct vkd3d_root_signature_desc *)desc; vkd3d_desc.u.v_1_0 = *(const struct vkd3d_shader_root_signature_desc *)desc;
if ((ret = vkd3d_shader_serialize_root_signature(&vkd3d_desc, &dxbc)) < 0) if ((ret = vkd3d_shader_serialize_root_signature(&vkd3d_desc, &dxbc)) < 0)
{ {
WARN("Failed to serialize root signature, vkd3d result %d.\n", ret); WARN("Failed to serialize root signature, vkd3d result %d.\n", ret);