Francisco Casas : vkd3d-shader/hlsl: Validate that statics don't contain both resources and numerics.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 6873b7130417b32474705339e6c94c6364d88115
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/6873b7130417b32474705339e6c94c...

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

vkd3d-shader/hlsl: Validate that statics don't contain both resources and numerics.

---

 libs/vkd3d-shader/hlsl.y       | 27 +++++++++++++++++++++++++++
 tests/hlsl-invalid.shader_test | 14 ++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 0e97d4d1..6461ade5 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -1907,6 +1907,26 @@ static bool type_has_object_components(struct hlsl_type *type, bool must_be_in_s
     return false;
 }
 
+static bool type_has_numeric_components(struct hlsl_type *type)
+{
+    if (type->type <= HLSL_CLASS_LAST_NUMERIC)
+        return true;
+    if (type->type == HLSL_CLASS_ARRAY)
+        return type_has_numeric_components(type->e.array.type);
+
+    if (type->type == HLSL_CLASS_STRUCT)
+    {
+        unsigned int i;
+
+        for (i = 0; i < type->e.record.field_count; ++i)
+        {
+            if (type_has_numeric_components(type->e.record.fields[i].type))
+                return true;
+        }
+    }
+    return false;
+}
+
 static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type,
         DWORD modifiers, struct list *var_list)
 {
@@ -2076,6 +2096,13 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t
                         "Semantics are not allowed on local variables.");
         }
 
+        if ((var->modifiers & HLSL_STORAGE_STATIC) && type_has_numeric_components(var->data_type)
+                && type_has_object_components(var->data_type, false))
+        {
+            hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE,
+                    "Static variables cannot have both numeric and resource components.");
+        }
+
         if ((type->modifiers & HLSL_MODIFIER_CONST) && !v->initializer.args_count
                 && !(modifiers & (HLSL_STORAGE_STATIC | HLSL_STORAGE_UNIFORM)))
         {
diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test
index a7364b1e..1b39d7f0 100644
--- a/tests/hlsl-invalid.shader_test
+++ b/tests/hlsl-invalid.shader_test
@@ -250,3 +250,17 @@ float4 main() : sv_target
     a.a = 1;
     return a.a;
 }
+
+[pixel shader fail]
+struct apple
+{
+    sampler sam;
+    float4 aa;
+};
+
+static struct apple a;
+
+float4 main() : sv_target
+{
+    return 1.0;
+}