wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Rename the vkd3d_descriptor_range_flags enumeration to vkd3d_shader_descriptor_range_flags.

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

16
include/vkd3d_shader.h
View File

@ -511,13 +511,15 @@ enum vkd3d_root_descriptor_flags
VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8,
}; };
enum vkd3d_descriptor_range_flags enum vkd3d_shader_descriptor_range_flags
{ {
VKD3D_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE = 0x0,
VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1,
VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2,
VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4,
VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8,
VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAGS),
}; };
struct vkd3d_descriptor_range1 struct vkd3d_descriptor_range1
@ -526,7 +528,7 @@ struct vkd3d_descriptor_range1
unsigned int descriptor_count; unsigned int descriptor_count;
unsigned int base_shader_register; unsigned int base_shader_register;
unsigned int register_space; unsigned int register_space;
enum vkd3d_descriptor_range_flags flags; enum vkd3d_shader_descriptor_range_flags flags;
unsigned int descriptor_table_offset; unsigned int descriptor_table_offset;
}; };

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

@ -2214,7 +2214,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length,
#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_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE
#define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \ #define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \
(VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) (VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE)
struct root_signature_parser_context struct root_signature_parser_context
{ {
@ -2255,11 +2255,11 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context *
static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range)
{ {
unsigned int unknown_flags = range->flags & ~(VKD3D_DESCRIPTOR_RANGE_FLAG_NONE unsigned int unknown_flags = range->flags & ~(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE
| VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE
| VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE
| VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE
| VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC); | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC);
if (unknown_flags) if (unknown_flags)
FIXME("Unknown descriptor range flags %#x.\n", unknown_flags); FIXME("Unknown descriptor range flags %#x.\n", unknown_flags);