[PATCH v2 10/10] vkd3d-shader/hlsl: Error out when a semantic is used with multiple types.

[Francisco Casas]

From: Francisco Casas

Considering row vectors from row_major matrices as having a different
layout as regular vectors, and error out in that case, is left as todo.
---
 libs/vkd3d-shader/hlsl.h                |  1 +
 libs/vkd3d-shader/hlsl_codegen.c        | 27 +++++++++++++++++++++++++
 tests/entry-point-semantics.shader_test |  6 +++---
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index f4dc468f..a69bdbb4 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -396,6 +396,7 @@ struct hlsl_ir_var
     uint32_t is_param : 1;
     uint32_t is_missing_semantics : 1;
     uint32_t semantic_has_multiple_uses : 1;
+    uint32_t semantic_uses_have_different_types : 1;
 };

/* Sized array of variables representing a function's parameters. */
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 47d89d53..2bbbebc7 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -232,6 +232,25 @@ static void validate_field_semantic(struct hlsl_ctx *ctx, struct hlsl_struct_fie
     }
 }

+static enum hlsl_base_type base_type_get_equivalent_layout(enum hlsl_base_type base)
+{
+    if (base == HLSL_TYPE_BOOL)
+        return HLSL_TYPE_UINT;
+    if (base == HLSL_TYPE_INT)
+        return HLSL_TYPE_UINT;
+    if (base == HLSL_TYPE_HALF)
+        return HLSL_TYPE_FLOAT;
+    return base;
+}
+
+static bool types_have_same_layout(const struct hlsl_type *type1, const struct hlsl_type *type2)
+{
+    if (type1->dimx != type2->dimx)
+        return false;
+
+    return base_type_get_equivalent_layout(type1->base_type) == base_type_get_equivalent_layout(type2->base_type);
+}
+
 static struct hlsl_ir_var *add_semantic_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var,
         struct hlsl_type *type, unsigned int modifiers, const struct hlsl_semantic *semantic, bool output)
 {
@@ -252,6 +271,14 @@ static struct hlsl_ir_var *add_semantic_var(struct hlsl_ctx *ctx, struct hlsl_ir
                         "Output semantic "%s%u" is used multiple times.", semantic->name, semantic->index);
             ext_var->semantic_has_multiple_uses = 1;

+            if (!types_have_same_layout(ext_var->data_type, type) && !ext_var->semantic_uses_have_different_types)
+            {
+                hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC,
+                        "Semantic "%s%u" is used multiple times with different layout types.",
+                        semantic->name, semantic->index);
+                ext_var->semantic_uses_have_different_types = 1;
+            }
+
             hlsl_release_string_buffer(ctx, name);
             return ext_var;
         }
diff --git a/tests/entry-point-semantics.shader_test b/tests/entry-point-semantics.shader_test
index c9d0d9cc..7983f309 100644
--- a/tests/entry-point-semantics.shader_test
+++ b/tests/entry-point-semantics.shader_test
@@ -183,14 +183,14 @@ probe (0, 0) rgba (1.0, 2.0, 3.0, 0.0)

% Duplicated input semantics can only have different types if they have the same layout and register types.
-[pixel shader fail todo]
+[pixel shader fail]
 float4 main(in float2 a : TEXCOORD0, in float3 b : TEXCOORD0) : sv_target
 {
     return 0.0;
 }

-[pixel shader fail todo]
+[pixel shader fail]
 float4 main(in float2 a : TEXCOORD0, in int2 b : TEXCOORD0) : sv_target
 {
     return 0.0;
@@ -219,7 +219,7 @@ float4 main(in float2 a : TEXCOORD0, row_major float1x2 b : TEXCOORD0) : sv_targ
     return 0.0;
 }

-[pixel shader fail todo]
+[pixel shader fail]
 float4 main(in float2 a : TEXCOORD0, row_major float2x1 b : TEXCOORD0) : sv_target
 {
     return 0.0;