wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Always go through implicit conversion in assignments.

Browse Source 
Otherwise we silently skip some type checks.
This commit is contained in:
Francisco Casas 2022-10-12 14:43:26 -03:00 committed by Alexandre Julliard
parent e56db9bda5
commit 5a1b0dbf44
Notes: Alexandre Julliard 2022-10-18 00:13:00 +02:00 
Approved-by: Zebediah Figura (@zfigura)
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/29
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1636,12 +1636,10 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in
} }
if (lhs_type->type <= HLSL_CLASS_LAST_NUMERIC) if (lhs_type->type <= HLSL_CLASS_LAST_NUMERIC)
{
writemask = (1 << lhs_type->dimx) - 1; writemask = (1 << lhs_type->dimx) - 1;
if (!(rhs = add_implicit_conversion(ctx, instrs, rhs, lhs_type, &rhs->loc))) if (!(rhs = add_implicit_conversion(ctx, instrs, rhs, lhs_type, &rhs->loc)))
return NULL; return NULL;
}
while (lhs->type != HLSL_IR_LOAD) while (lhs->type != HLSL_IR_LOAD)
{ {

2
tests/cast-broadcast.shader_test
View File

@ -23,7 +23,7 @@ todo draw quad
todo probe all rgba (84.0, 84.0, 84.0, 84.0) todo probe all rgba (84.0, 84.0, 84.0, 84.0)
[pixel shader fail todo] [pixel shader fail]
struct apple struct apple
{ {
float3 aa; float3 aa;