Francisco Casas : vkd3d-shader/hlsl: Validate that extern structs don't contain objects SM < 5.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 2fa913ccaa96c2676d7b65dfea92c38abd56dda5
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/2fa913ccaa96c2676d7b65dfea92c3...

Author: Francisco Casas <fcasas(a)codeweavers.com>
Date:   Tue Nov  1 19:13:39 2022 -0300

vkd3d-shader/hlsl: Validate that extern structs don't contain objects SM < 5.

It is worth noting that these checks should also be included for
declarations inside cbuffers, once they are implemented.

---

 libs/vkd3d-shader/hlsl.y | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index f77b0b61..0e97d4d1 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -1887,6 +1887,26 @@ static void initialize_var_components(struct hlsl_ctx *ctx, struct list *instrs,
     }
 }
 
+static bool type_has_object_components(struct hlsl_type *type, bool must_be_in_struct)
+{
+    if (type->type == HLSL_CLASS_OBJECT)
+        return !must_be_in_struct;
+    if (type->type == HLSL_CLASS_ARRAY)
+        return type_has_object_components(type->e.array.type, must_be_in_struct);
+
+    if (type->type == HLSL_CLASS_STRUCT)
+    {
+        unsigned int i;
+
+        for (i = 0; i < type->e.record.field_count; ++i)
+        {
+            if (type_has_object_components(type->e.record.fields[i].type, false))
+                return true;
+        }
+    }
+    return false;
+}
+
 static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type,
         DWORD modifiers, struct list *var_list)
 {
@@ -2022,6 +2042,13 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t
             if (!(modifiers & HLSL_STORAGE_STATIC))
                 var->modifiers |= HLSL_STORAGE_UNIFORM;
 
+            if (ctx->profile->major_version < 5 && (var->modifiers & HLSL_STORAGE_UNIFORM) &&
+                    type_has_object_components(var->data_type, true))
+            {
+                hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE,
+                        "Target profile doesn't support objects as struct members in uniform variables.\n");
+            }
+
             if ((func = hlsl_get_func_decl(ctx, var->name)))
             {
                 hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED,