mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d-shader: Rename the vkd3d_root_descriptor_flags enumeration to vkd3d_shader_root_descriptor_flags. 

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-14 15:52:54 +04:30 committed by Alexandre Julliard
parent 6b0eb46716
commit de252f9b14
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/vkd3d_shader.h
View File

@ -503,12 +503,14 @@ struct vkd3d_root_signature_desc
}; };
/* root signature 1.1 */ /* root signature 1.1 */
enum vkd3d_root_descriptor_flags enum vkd3d_shader_root_descriptor_flags
{ {
VKD3D_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE = 0x0,
VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2,
VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4,
VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAGS),
}; };
enum vkd3d_shader_descriptor_range_flags enum vkd3d_shader_descriptor_range_flags
@ -542,7 +544,7 @@ struct vkd3d_root_descriptor1
{ {
unsigned int shader_register; unsigned int shader_register;
unsigned int register_space; unsigned int register_space;
enum vkd3d_root_descriptor_flags flags; enum vkd3d_shader_root_descriptor_flags flags;
}; };
struct vkd3d_root_parameter1 struct vkd3d_root_parameter1

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

@ -2211,7 +2211,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length,
} }
/* root signatures */ /* 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 \ #define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \
(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) (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) static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor)
{ {
unsigned int unknown_flags = descriptor->flags & ~(VKD3D_ROOT_DESCRIPTOR_FLAG_NONE unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE
| VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE
| VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE
| VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_STATIC);
if (unknown_flags) if (unknown_flags)
FIXME("Unknown root descriptor flags %#x.\n", unknown_flags); FIXME("Unknown root descriptor flags %#x.\n", unknown_flags);