wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Do not consider scalars and 1-dimensional vectors to be equivalent in function parameters.

Browse Source
This commit is contained in:
Zebediah Figura
2023-09-08 16:40:22 -05:00
committed by Alexandre Julliard
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
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/vkd3d-shader/hlsl.c
View File

@ -2053,11 +2053,7 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls
int r; int r;
if ((r = vkd3d_u32_compare(t1->class, t2->class))) if ((r = vkd3d_u32_compare(t1->class, t2->class)))
{ return r;
if (!((t1->class == HLSL_CLASS_SCALAR && t2->class == HLSL_CLASS_VECTOR)
|| (t1->class == HLSL_CLASS_VECTOR && t2->class == HLSL_CLASS_SCALAR)))
return r;
}
if ((r = vkd3d_u32_compare(t1->base_type, t2->base_type))) if ((r = vkd3d_u32_compare(t1->base_type, t2->base_type)))
return r; return r;
if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE)

6
tests/hlsl/function-overload.shader_test
View File

@ -43,7 +43,7 @@ probe all rgba (0.1, 0.2, 0.1, 0.2)
% float and float1 can be defined separately... % float and float1 can be defined separately...
[pixel shader todo] [pixel shader]
void func(float arg) {} void func(float arg) {}
void func(float1 arg) {} void func(float1 arg) {}
@ -55,7 +55,7 @@ float4 main() : sv_target
% ...but invoking them is considered ambiguous and fails. % ...but invoking them is considered ambiguous and fails.
[pixel shader fail] [pixel shader fail todo]
void func(float arg) {} void func(float arg) {}
void func(float1 arg) {} void func(float1 arg) {}
@ -67,7 +67,7 @@ float4 main() : sv_target
return 1.0; return 1.0;
} }
[pixel shader fail] [pixel shader fail todo]
void func(float arg) {} void func(float arg) {}
void func(float1 arg) {} void func(float1 arg) {}