wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/tpf: Write out 'switch' statements.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2023-10-26 22:26:33 +02:00 committed by Alexandre Julliard
parent 68c14079a6
commit bc2a4ee66a
Notes: Alexandre Julliard 2023-10-31 22:37:53 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/361
2 changed files with 81 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libs/vkd3d-shader/tpf.c
View File

@ -5467,6 +5467,46 @@ static void write_sm4_store(const struct tpf_writer *tpf, const struct hlsl_ir_s
write_sm4_instruction(tpf, &instr); write_sm4_instruction(tpf, &instr);
} }
static void write_sm4_switch(const struct tpf_writer *tpf, const struct hlsl_ir_switch *s)
{
const struct hlsl_ir_node *selector = s->selector.node;
struct hlsl_ir_switch_case *c;
struct sm4_instruction instr;
memset(&instr, 0, sizeof(instr));
instr.opcode = VKD3D_SM4_OP_SWITCH;
sm4_src_from_node(tpf, &instr.srcs[0], selector, VKD3DSP_WRITEMASK_ALL);
instr.src_count = 1;
write_sm4_instruction(tpf, &instr);
LIST_FOR_EACH_ENTRY(c, &s->cases, struct hlsl_ir_switch_case, entry)
{
memset(&instr, 0, sizeof(instr));
if (c->is_default)
{
instr.opcode = VKD3D_SM4_OP_DEFAULT;
}
else
{
struct hlsl_constant_value value = { .u[0].u = c->value };
instr.opcode = VKD3D_SM4_OP_CASE;
sm4_src_from_constant_value(&instr.srcs[0], &value, 1, VKD3DSP_WRITEMASK_ALL);
instr.src_count = 1;
}
write_sm4_instruction(tpf, &instr);
write_sm4_block(tpf, &c->body);
}
memset(&instr, 0, sizeof(instr));
instr.opcode = VKD3D_SM4_OP_ENDSWITCH;
write_sm4_instruction(tpf, &instr);
}
static void write_sm4_swizzle(const struct tpf_writer *tpf, const struct hlsl_ir_swizzle *swizzle) static void write_sm4_swizzle(const struct tpf_writer *tpf, const struct hlsl_ir_swizzle *swizzle)
{ {
unsigned int hlsl_swizzle; unsigned int hlsl_swizzle;
@ -5554,6 +5594,10 @@ static void write_sm4_block(const struct tpf_writer *tpf, const struct hlsl_bloc
write_sm4_store(tpf, hlsl_ir_store(instr)); write_sm4_store(tpf, hlsl_ir_store(instr));
break; break;
case HLSL_IR_SWITCH:
write_sm4_switch(tpf, hlsl_ir_switch(instr));
break;
case HLSL_IR_SWIZZLE: case HLSL_IR_SWIZZLE:
write_sm4_swizzle(tpf, hlsl_ir_swizzle(instr)); write_sm4_swizzle(tpf, hlsl_ir_swizzle(instr));
break; break;

74
tests/hlsl/switch.shader_test
View File

@ -1,7 +1,7 @@
[require] [require]
shader model >= 4.0 shader model >= 4.0
[pixel shader todo] [pixel shader]
uint4 v; uint4 v;
float4 main() : sv_target float4 main() : sv_target
@ -19,17 +19,17 @@ float4 main() : sv_target
[test] [test]
uniform 0 uint4 3 0 0 0 uniform 0 uint4 3 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (5.0, 5.0, 5.0, 5.0) probe all rgba (5.0, 5.0, 5.0, 5.0)
uniform 0 uint4 1 0 0 0 uniform 0 uint4 1 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (4.0, 4.0, 4.0, 4.0) probe all rgba (4.0, 4.0, 4.0, 4.0)
uniform 0 uint4 0 0 0 0 uniform 0 uint4 0 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (3.0, 3.0, 3.0, 3.0) probe all rgba (3.0, 3.0, 3.0, 3.0)
% falling through is only supported for empty case statements % falling through is only supported for empty case statements
[pixel shader todo] [pixel shader]
uint4 v; uint4 v;
float4 main() : sv_target float4 main() : sv_target
@ -49,17 +49,17 @@ float4 main() : sv_target
[test] [test]
uniform 0 uint4 2 0 0 0 uniform 0 uint4 2 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0) probe all rgba (1.0, 2.0, 3.0, 4.0)
uniform 0 uint4 1 0 0 0 uniform 0 uint4 1 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.1, 2.0, 3.0, 4.0) probe all rgba (1.1, 2.0, 3.0, 4.0)
uniform 0 uint4 0 0 0 0 uniform 0 uint4 0 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.1, 2.0, 3.0, 4.0) probe all rgba (1.1, 2.0, 3.0, 4.0)
% case value evaluation % case value evaluation
[pixel shader todo] [pixel shader]
uint4 v; uint4 v;
float4 main() : sv_target float4 main() : sv_target
@ -81,14 +81,14 @@ float4 main() : sv_target
[test] [test]
uniform 0 uint4 2 0 0 0 uniform 0 uint4 2 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.1, 2.1, 3.1, 4.1) probe all rgba (1.1, 2.1, 3.1, 4.1)
uniform 0 uint4 1 0 0 0 uniform 0 uint4 1 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0) probe all rgba (1.0, 2.0, 3.0, 4.0)
% floats are accepted % floats are accepted
[pixel shader todo fail(sm>=6)] [pixel shader fail(sm>=6)]
uint4 v; uint4 v;
float4 main() : sv_target float4 main() : sv_target
@ -110,13 +110,13 @@ float4 main() : sv_target
[test] [test]
uniform 0 uint4 2 0 0 0 uniform 0 uint4 2 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.1, 2.1, 3.1, 4.1) probe all rgba (1.1, 2.1, 3.1, 4.1)
uniform 0 uint4 1 0 0 0 uniform 0 uint4 1 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0) probe all rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader todo fail(sm>=6)] [pixel shader fail(sm>=6)]
float4 v; float4 v;
float4 main() : sv_target float4 main() : sv_target
@ -138,10 +138,10 @@ float4 main() : sv_target
[test] [test]
uniform 0 float4 2.0 0.0 0.0 0.0 uniform 0 float4 2.0 0.0 0.0 0.0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.1, 2.1, 3.1, 4.1) probe all rgba (1.1, 2.1, 3.1, 4.1)
uniform 0 float4 1.0 0.0 0.0 0.0 uniform 0 float4 1.0 0.0 0.0 0.0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0) probe all rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader fail] [pixel shader fail]
@ -312,7 +312,7 @@ float4 main() : sv_target
} }
% more complicated breaks % more complicated breaks
[pixel shader todo] [pixel shader]
uint4 v; uint4 v;
float4 main() : sv_target float4 main() : sv_target
@ -339,17 +339,17 @@ float4 main() : sv_target
[test] [test]
uniform 0 uint4 2 0 0 0 uniform 0 uint4 2 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.1, 2.1, 3.1, 4.1) probe all rgba (1.1, 2.1, 3.1, 4.1)
uniform 0 uint4 1 0 0 0 uniform 0 uint4 1 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.2, 2.2, 3.2, 4.2) probe all rgba (1.2, 2.2, 3.2, 4.2)
uniform 0 uint4 0 0 0 0 uniform 0 uint4 0 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0) probe all rgba (1.0, 2.0, 3.0, 4.0)
% switch breaks within a loop % switch breaks within a loop
[pixel shader todo] [pixel shader]
uint4 v; uint4 v;
float4 main() : sv_target float4 main() : sv_target
@ -377,11 +377,11 @@ float4 main() : sv_target
[test] [test]
uniform 0 uint4 2 0 0 0 uniform 0 uint4 2 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (5.0, 6.0, 7.0, 8.0) probe all rgba (5.0, 6.0, 7.0, 8.0)
% default case placement % default case placement
[pixel shader todo] [pixel shader]
uint4 v; uint4 v;
float4 main() : sv_target float4 main() : sv_target
@ -408,16 +408,16 @@ float4 main() : sv_target
[test] [test]
uniform 0 uint4 0 0 0 0 uniform 0 uint4 0 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (4.0, 5.0, 6.0, 7.0) probe all rgba (4.0, 5.0, 6.0, 7.0)
uniform 0 uint4 2 0 0 0 uniform 0 uint4 2 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (2.0, 3.0, 4.0, 5.0) probe all rgba (2.0, 3.0, 4.0, 5.0)
uniform 0 uint4 3 0 0 0 uniform 0 uint4 3 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (4.0, 5.0, 6.0, 7.0) probe all rgba (4.0, 5.0, 6.0, 7.0)
[pixel shader todo] [pixel shader]
uint4 v; uint4 v;
float4 main() : sv_target float4 main() : sv_target
@ -445,13 +445,13 @@ float4 main() : sv_target
[test] [test]
uniform 0 uint4 3 0 0 0 uniform 0 uint4 3 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0) probe all rgba (1.0, 2.0, 3.0, 4.0)
uniform 0 uint4 0 0 0 0 uniform 0 uint4 0 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (4.0, 5.0, 6.0, 7.0) probe all rgba (4.0, 5.0, 6.0, 7.0)
uniform 0 uint4 5 0 0 0 uniform 0 uint4 5 0 0 0
todo draw quad todo(sm>=6) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0) probe all rgba (1.0, 2.0, 3.0, 4.0)
% 'continue' is not supported in switches % 'continue' is not supported in switches
@ -480,7 +480,7 @@ float4 main() : sv_target
return c; return c;
} }
[pixel shader todo] [pixel shader]
uint4 v; uint4 v;
float4 main() : sv_target float4 main() : sv_target
@ -511,14 +511,14 @@ float4 main() : sv_target
[test] [test]
uniform 0 uint4 0 0 3 1 uniform 0 uint4 0 0 3 1
todo draw quad todo(sm>=6) draw quad
probe all rgba (10.0, 11.0, 12.0, 13.0) probe all rgba (10.0, 11.0, 12.0, 13.0)
uniform 0 uint4 1 0 3 1 uniform 0 uint4 1 0 3 1
todo draw quad todo(sm>=6) draw quad
probe all rgba (7.0, 8.0, 9.0, 10.0) probe all rgba (7.0, 8.0, 9.0, 10.0)
% return from a switch nested in a loop % return from a switch nested in a loop
[pixel shader todo] [pixel shader]
uint4 v; uint4 v;
float4 main() : sv_target float4 main() : sv_target
@ -545,8 +545,8 @@ float4 main() : sv_target
[test] [test]
uniform 0 uint4 0 0 3 1 uniform 0 uint4 0 0 3 1
todo draw quad todo(sm>=6) draw quad
probe all rgba (304.0, 305.0, 306.0, 307.0) probe all rgba (304.0, 305.0, 306.0, 307.0)
uniform 0 uint4 1 0 3 1 uniform 0 uint4 1 0 3 1
todo draw quad todo(sm>=6) draw quad
probe all rgba (3.0, 4.0, 5.0, 6.0) probe all rgba (3.0, 4.0, 5.0, 6.0)