Henri Verbeet : vkd3d-shader: Rename the vkd3d_descriptor_range_flags enumeration to vkd3d_shader_descriptor_range_flags.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 7c2120124bcce403a7800e9e198d1fb01c904051
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=7c2120124bcce403a7800e9e...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue Jul 14 16:10:51 2020 +0430

vkd3d-shader: Rename the vkd3d_descriptor_range_flags enumeration to vkd3d_shader_descriptor_range_flags.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 include/vkd3d_shader.h   | 16 +++++++++-------
 libs/vkd3d-shader/dxbc.c | 12 ++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 50c64ca..cc61dc5 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -511,13 +511,15 @@ enum vkd3d_root_descriptor_flags
     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_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1,
-    VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2,
-    VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4,
-    VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8,
+    VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE                             = 0x0,
+    VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE             = 0x1,
+    VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE                    = 0x2,
+    VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4,
+    VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC                      = 0x8,
+
+    VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAGS),
 };
 
 struct vkd3d_descriptor_range1
@@ -526,7 +528,7 @@ struct vkd3d_descriptor_range1
     unsigned int descriptor_count;
     unsigned int base_shader_register;
     unsigned int register_space;
-    enum vkd3d_descriptor_range_flags flags;
+    enum vkd3d_shader_descriptor_range_flags flags;
     unsigned int descriptor_table_offset;
 };
 
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index a0f03cf..6035aee 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -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_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
 {
@@ -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)
 {
-    unsigned int unknown_flags = range->flags & ~(VKD3D_DESCRIPTOR_RANGE_FLAG_NONE
-            | VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE
-            | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE
-            | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE
-            | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC);
+    unsigned int unknown_flags = range->flags & ~(VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_NONE
+            | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE
+            | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE
+            | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE
+            | VKD3D_SHADER_DESCRIPTOR_RANGE_FLAG_DATA_STATIC);
 
     if (unknown_flags)
         FIXME("Unknown descriptor range flags %#x.\n", unknown_flags);