[PATCH vkd3d 4/5] vkd3d-shader: Rename the vkd3d_root_descriptor_flags enumeration to vkd3d_shader_root_descriptor_flags.
Henri Verbeet
hverbeet at codeweavers.com
Tue Jul 14 06:22:54 CDT 2020
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
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 ab670ec..b5bf13a 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 76a6a47..cad2556 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);
--
2.11.0
More information about the wine-devel
mailing list