mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2025-01-28 13:05:02 -08:00
vkd3d-shader/hlsl: Do not consider scalars and 1-dimensional vectors to be equivalent in function parameters.
This commit is contained in:
parent
b1c2852cd7
commit
514d179b70
Notes:
Alexandre Julliard
2023-11-10 00:10:07 +01:00
Approved-by: Giovanni Mascellani (@giomasce) Approved-by: Henri Verbeet (@hverbeet) Approved-by: Alexandre Julliard (@julliard) Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/454
@ -2053,11 +2053,7 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls
|
||||
int r;
|
||||
|
||||
if ((r = vkd3d_u32_compare(t1->class, t2->class)))
|
||||
{
|
||||
if (!((t1->class == HLSL_CLASS_SCALAR && t2->class == HLSL_CLASS_VECTOR)
|
||||
|| (t1->class == HLSL_CLASS_VECTOR && t2->class == HLSL_CLASS_SCALAR)))
|
||||
return r;
|
||||
}
|
||||
return r;
|
||||
if ((r = vkd3d_u32_compare(t1->base_type, t2->base_type)))
|
||||
return r;
|
||||
if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE)
|
||||
|
@ -43,7 +43,7 @@ probe all rgba (0.1, 0.2, 0.1, 0.2)
|
||||
|
||||
% float and float1 can be defined separately...
|
||||
|
||||
[pixel shader todo]
|
||||
[pixel shader]
|
||||
void func(float arg) {}
|
||||
void func(float1 arg) {}
|
||||
|
||||
@ -55,7 +55,7 @@ float4 main() : sv_target
|
||||
|
||||
% ...but invoking them is considered ambiguous and fails.
|
||||
|
||||
[pixel shader fail]
|
||||
[pixel shader fail todo]
|
||||
|
||||
void func(float arg) {}
|
||||
void func(float1 arg) {}
|
||||
@ -67,7 +67,7 @@ float4 main() : sv_target
|
||||
return 1.0;
|
||||
}
|
||||
|
||||
[pixel shader fail]
|
||||
[pixel shader fail todo]
|
||||
|
||||
void func(float arg) {}
|
||||
void func(float1 arg) {}
|
||||
|
Loading…
x
Reference in New Issue
Block a user