From de252f9b144de53a67577fe1fb42a7a0c770bed3 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 14 Jul 2020 15:52:54 +0430 Subject: [PATCH] vkd3d-shader: Rename the vkd3d_root_descriptor_flags enumeration to vkd3d_shader_root_descriptor_flags. Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- include/vkd3d_shader.h | 14 ++++++++------ libs/vkd3d-shader/dxbc.c | 10 +++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ab670ec8..b5bf13a5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -503,12 +503,14 @@ struct vkd3d_root_signature_desc }; /* root signature 1.1 */ -enum vkd3d_root_descriptor_flags +enum vkd3d_shader_root_descriptor_flags { - VKD3D_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, - VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, - VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, - VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAGS), }; enum vkd3d_shader_descriptor_range_flags @@ -542,7 +544,7 @@ struct vkd3d_root_descriptor1 { unsigned int shader_register; unsigned int register_space; - enum vkd3d_root_descriptor_flags flags; + enum vkd3d_shader_root_descriptor_flags flags; }; struct vkd3d_root_parameter1 diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 76a6a472..cad25565 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2211,7 +2211,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, } /* root signatures */ -#define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE +#define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE #define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \ (VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) @@ -2398,10 +2398,10 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) { - unsigned int unknown_flags = descriptor->flags & ~(VKD3D_ROOT_DESCRIPTOR_FLAG_NONE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE - | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); + unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); if (unknown_flags) FIXME("Unknown root descriptor flags %#x.\n", unknown_flags);