Conor McCarthy : vkd3d-shader/tpf: Validate signature element masks.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 2166088b0b63dc33dd028954ad67ce68ed2a5aa5
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/2166088b0b63dc33dd028954ad67ce...

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Wed May  3 17:19:32 2023 +1000

vkd3d-shader/tpf: Validate signature element masks.

---

 libs/vkd3d-shader/tpf.c                  | 9 ++++++++-
 libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c
index 143df771..77fea973 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -2203,7 +2203,7 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t
 static bool shader_sm4_parser_validate_signature(struct vkd3d_shader_sm4_parser *sm4,
         const struct shader_signature *signature, const char *name)
 {
-    unsigned int i, register_idx, register_count;
+    unsigned int i, register_idx, register_count, mask;
 
     for (i = 0; i < signature->element_count; ++i)
     {
@@ -2218,6 +2218,13 @@ static bool shader_sm4_parser_validate_signature(struct vkd3d_shader_sm4_parser
                     i, register_idx, register_count, MAX_REG_OUTPUT - 1);
             return false;
         }
+
+        if (!vkd3d_bitmask_is_contiguous(mask = signature->elements[i].mask))
+        {
+            WARN("%s signature element %u mask %#x is not contiguous.\n", name, i, mask);
+            vkd3d_shader_parser_warning(&sm4->p, VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS,
+                    "%s signature element %u mask %#x is not contiguous.", name, i, mask);
+        }
     }
 
     return true;
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 180aecc1..6a8881eb 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -77,6 +77,8 @@ enum vkd3d_shader_error
     VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_INDEX_COUNT = 1003,
     VKD3D_SHADER_ERROR_TPF_TOO_MANY_REGISTERS           = 1004,
 
+    VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS        = 1300,
+
     VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000,
     VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE        = 2001,
     VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING   = 2002,