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 type classes.

Browse Source
This commit is contained in:
Henri Verbeet
2024-12-10 22:00:07 +01:00
parent 63fce3062e
commit 6b8878377f
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
2 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2998,11 +2998,32 @@ static bool func_is_compatible_match(struct hlsl_ctx *ctx, const struct hlsl_ir_
return true;
}
static enum hlsl_base_type hlsl_base_type_class(enum hlsl_base_type t)
{
switch (t)
{
case HLSL_TYPE_HALF:
case HLSL_TYPE_FLOAT:
case HLSL_TYPE_DOUBLE:
return HLSL_TYPE_FLOAT;
case HLSL_TYPE_INT:
case HLSL_TYPE_UINT:
return HLSL_TYPE_INT;
case HLSL_TYPE_BOOL:
return HLSL_TYPE_BOOL;
}
return 0;
}
static int function_parameter_compare(const struct hlsl_ir_var *candidate,
const struct hlsl_ir_var *ref, const struct hlsl_ir_node *arg)
{
struct
{
enum hlsl_base_type class;
unsigned int count;
} c, r, a;
int ret;
@@ -3011,8 +3032,13 @@ 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.count = hlsl_type_component_count(candidate->data_type);
r.class = hlsl_base_type_class(ref->data_type->e.numeric.type);
r.count = hlsl_type_component_count(ref->data_type);
a.class = hlsl_base_type_class(arg->data_type->e.numeric.type);
a.count = hlsl_type_component_count(arg->data_type);
/* Prefer candidates without component count narrowing. E.g., given an
@@ -3020,6 +3046,11 @@ static int function_parameter_compare(const struct hlsl_ir_var *candidate,
if ((ret = (a.count > r.count) - (a.count > c.count)))
return ret;
/* Prefer candidates with matching component type classes. E.g., given a
* float argument, double is a better match than int. */
if ((ret = (a.class == c.class) - (a.class == r.class)))
return ret;
return 0;
}