[HACK] vkd3d-shader/hlsl: Prioritize exact match on function overloads, again.

Francisco Casas · ivyl · commit 0c0a55c0382c · 2024-11-21T17:32:00.000+02:00
This patch is aimed for proton_9.0-4 to avoid regressions after commit fef1185. This is marked as a HACK because in some rare multiple compatible overload edge cases the exact match is not prioritized.
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
@@ -2965,6 +2965,30 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var
     return initializers;
 }
 
+static bool func_is_exact_match(const struct hlsl_ir_function_decl *decl,
+        bool is_compile, const struct parse_initializer *args)
+{
+    unsigned int i, k;
+
+    k = 0;
+    for (i = 0; i < decl->parameters.count; ++i)
+    {
+        if (is_compile && !(decl->parameters.vars[i]->storage_modifiers & HLSL_STORAGE_UNIFORM))
+            continue;
+
+        if (k >= args->args_count)
+            return false;
+
+        if (!hlsl_types_are_equal(decl->parameters.vars[i]->data_type, args->args[i]->data_type))
+            return false;
+
+        ++k;
+    }
+    if (k < args->args_count)
+        return false;
+    return true;
+}
+
 static bool func_is_compatible_match(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *decl,
         bool is_compile, const struct parse_initializer *args)
 {
@@ -3007,6 +3031,9 @@ static struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *ctx,
 
     LIST_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry)
     {
+        if (func_is_exact_match(decl, is_compile, args))
+            return decl;
+
         if (func_is_compatible_match(ctx, decl, is_compile, args))
         {
             if (compatible_match)
diff --git a/tests/hlsl/function-overload.shader_test b/tests/hlsl/function-overload.shader_test
@@ -58,7 +58,7 @@ float4 main() : sv_target
 }
 
 
-[pixel shader todo]
+[pixel shader]
 float func(int arg)
 {
     return 1.0;
@@ -78,8 +78,8 @@ float4 main() : sv_target
 }
 
 [test]
-todo(sm<6) draw quad
-todo(sm<6) probe (0,0) rgba (1.0, 2.0, 2.0, 2.0)
+draw quad
+probe (0,0) rgba (1.0, 2.0, 2.0, 2.0)
 
 
 % float and float1 can be defined separately...
diff --git a/tests/hlsl/refract.shader_test b/tests/hlsl/refract.shader_test
@@ -204,7 +204,7 @@ float4 main() : sv_target
     return refract(r, n, i);
 }
 
-[pixel shader todo(sm<6)]
+[pixel shader]
 float4 r;
 float4 n;
 float i;
@@ -228,6 +228,6 @@ float4 main() : sv_target
 }
 
 [test]
-todo(sm<6) draw quad
+draw quad
 if(sm<6) probe (0,0) rgba (2.0, 1.0, 1.0, 1.0)
 if(sm>=6) probe (0,0) rgba (1.0, 1.0, 1.0, 1.0)

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ float4 main() : sv_target`
`58`	`58`	`}`
`59`	`59`
`60`	`60`
`61`		`-[pixel shader todo]`
	`61`	`+[pixel shader]`
`62`	`62`	`float func(int arg)`
`63`	`63`	`{`
`64`	`64`	`return 1.0;`
`@@ -78,8 +78,8 @@ float4 main() : sv_target`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`[test]`
`81`		`-todo(sm<6) draw quad`
`82`		`-todo(sm<6) probe (0,0) rgba (1.0, 2.0, 2.0, 2.0)`
	`81`	`+draw quad`
	`82`	`+probe (0,0) rgba (1.0, 2.0, 2.0, 2.0)`
`83`	`83`
`84`	`84`
`85`	`85`	`% float and float1 can be defined separately...`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ float4 main() : sv_target`
`204`	`204`	`return refract(r, n, i);`
`205`	`205`	`}`
`206`	`206`
`207`		`-[pixel shader todo(sm<6)]`
	`207`	`+[pixel shader]`
`208`	`208`	`float4 r;`
`209`	`209`	`float4 n;`
`210`	`210`	`float i;`
`@@ -228,6 +228,6 @@ float4 main() : sv_target`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`[test]`
`231`		`-todo(sm<6) draw quad`
	`231`	`+draw quad`
`232`	`232`	`if(sm<6) probe (0,0) rgba (2.0, 1.0, 1.0, 1.0)`
`233`	`233`	`if(sm>=6) probe (0,0) rgba (1.0, 1.0, 1.0, 1.0)`