[PATCH vkd3d 3/6] vkd3d-shader: Add FIXME() for unknown root signature descriptor flags.

Józef Kucia joseph.kucia at gmail.com
Wed Apr 24 09:05:45 CDT 2019


From: Józef Kucia <jkucia at codeweavers.com>

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 libs/vkd3d-shader/dxbc.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 1230f309fc14..3fe728e2e789 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -2130,6 +2130,18 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context *
     return VKD3D_OK;
 }
 
+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);
+
+    if (unknown_flags)
+        FIXME("Unknown descriptor range flags %#x.\n", unknown_flags);
+}
+
 static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context,
         unsigned int offset, unsigned int count, struct vkd3d_descriptor_range1 *ranges)
 {
@@ -2157,6 +2169,8 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context
                 ranges[i].range_type, ranges[i].descriptor_count,
                 ranges[i].base_shader_register, ranges[i].register_space,
                 ranges[i].flags, ranges[i].descriptor_table_offset);
+
+        shader_validate_descriptor_range1(&ranges[i]);
     }
 
     return VKD3D_OK;
@@ -2259,6 +2273,17 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co
     return VKD3D_OK;
 }
 
+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);
+
+    if (unknown_flags)
+        FIXME("Unknown root descriptor flags %#x.\n", unknown_flags);
+}
+
 static int shader_parse_root_descriptor1(struct root_signature_parser_context *context,
         unsigned int offset, struct vkd3d_root_descriptor1 *descriptor)
 {
@@ -2278,6 +2303,8 @@ static int shader_parse_root_descriptor1(struct root_signature_parser_context *c
     TRACE("Shader register %u, register space %u, flags %#x.\n",
             descriptor->shader_register, descriptor->register_space, descriptor->flags);
 
+    shader_validate_root_descriptor1(descriptor);
+
     return VKD3D_OK;
 }
 
-- 
2.21.0




More information about the wine-devel mailing list