wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Prefer overload candidates with matching component types.

Browse Source
This commit is contained in:
Henri Verbeet
2024-12-10 22:10:11 +01:00
parent 6b8878377f
commit 32d432ab5e
Notes: Henri Verbeet 2024-12-16 17:26:51 +01:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1313
3 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/vkd3d-shader/hlsl.y
View File

@@ -3023,6 +3023,7 @@ static int function_parameter_compare(const struct hlsl_ir_var *candidate,
{
struct
{
enum hlsl_base_type type;
enum hlsl_base_type class;
unsigned int count;
} c, r, a;
@@ -3032,13 +3033,16 @@ static int function_parameter_compare(const struct hlsl_ir_var *candidate,
if (!hlsl_is_numeric_type(arg->data_type))
return 0;
c.class = hlsl_base_type_class(candidate->data_type->e.numeric.type);
c.type = candidate->data_type->e.numeric.type;
c.class = hlsl_base_type_class(c.type);
c.count = hlsl_type_component_count(candidate->data_type);
r.class = hlsl_base_type_class(ref->data_type->e.numeric.type);
r.type = ref->data_type->e.numeric.type;
r.class = hlsl_base_type_class(r.type);
r.count = hlsl_type_component_count(ref->data_type);
a.class = hlsl_base_type_class(arg->data_type->e.numeric.type);
a.type = arg->data_type->e.numeric.type;
a.class = hlsl_base_type_class(a.type);
a.count = hlsl_type_component_count(arg->data_type);
/* Prefer candidates without component count narrowing. E.g., given an
@@ -3051,6 +3055,11 @@ static int function_parameter_compare(const struct hlsl_ir_var *candidate,
if ((ret = (a.class == c.class) - (a.class == r.class)))
return ret;
/* Prefer candidates with matching component types. E.g., given an int
* argument, int4 is a better match than uint4. */
if ((ret = (a.type == c.type) - (a.type == r.type)))
return ret;
return 0;
}