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/hlsl: Use conditional moves for arithmetic operators instead of branching.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2023-09-09 20:08:52 +02:00 committed by Alexandre Julliard
parent 34b1c0fe5d
commit 6d1ba83856
Notes: Alexandre Julliard 2023-09-22 22:46:41 +02: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/336
5 changed files with 69 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libs/vkd3d-shader/hlsl_codegen.c
View File

@ -2523,36 +2523,19 @@ static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr
struct hlsl_ir_node *hlsl_add_conditional(struct hlsl_ctx *ctx, struct hlsl_block *instrs,
struct hlsl_ir_node *condition, struct hlsl_ir_node *if_true, struct hlsl_ir_node *if_false)
{
struct hlsl_block then_block, else_block;
struct hlsl_ir_node *iff, *store;
struct hlsl_ir_load *load;
struct hlsl_ir_var *var;
struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS];
struct hlsl_ir_node *cond;
assert(hlsl_types_are_equal(if_true->data_type, if_false->data_type));
if (!(var = hlsl_new_synthetic_var(ctx, "conditional", if_true->data_type, &condition->loc)))
return NULL;
operands[0] = condition;
operands[1] = if_true;
operands[2] = if_false;
if (!(cond = hlsl_new_expr(ctx, HLSL_OP3_TERNARY, operands, if_true->data_type, &condition->loc)))
return false;
hlsl_block_add_instr(instrs, cond);
hlsl_block_init(&then_block);
hlsl_block_init(&else_block);
if (!(store = hlsl_new_simple_store(ctx, var, if_true)))
return NULL;
hlsl_block_add_instr(&then_block, store);
if (!(store = hlsl_new_simple_store(ctx, var, if_false)))
return NULL;
hlsl_block_add_instr(&else_block, store);
if (!(iff = hlsl_new_if(ctx, condition, &then_block, &else_block, &condition->loc)))
return NULL;
hlsl_block_add_instr(instrs, iff);
if (!(load = hlsl_new_var_load(ctx, var, &condition->loc)))
return NULL;
hlsl_block_add_instr(instrs, &load->node);
return &load->node;
return cond;
}
static bool lower_int_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block)

14
tests/hlsl/arithmetic-float-uniform.shader_test
View File

@ -58,6 +58,20 @@ uniform 0 float4 45.0 5.0 0.0 0.0
draw quad
probe all rgba (0.0, 0.0, 0.0, 0.0)
[pixel shader]
float4 x, y;
float4 main() : sv_target
{
return x % y;
}
[test]
uniform 0 float4 5.0 -42.1 4.0 45.0
uniform 4 float4 15.0 -5.0 4.1 5.0
draw quad
probe all rgba (5.0, -2.1, 4.0, 0.0) 4
[require]
% Infinities are not allowed in SM1
shader model >= 4.0

13
tests/hlsl/arithmetic-float.shader_test
View File

@ -50,6 +50,19 @@ float4 main() : SV_TARGET
draw quad
probe all rgba (0.0, 0.0, 0.0, 0.0)
[pixel shader]
float4 main() : sv_target
{
float4 x = {5.0, -42.1, 4.0, 45.0};
float4 y = {15.0, -5.0, 4.1, 5.0};
return x % y;
}
[test]
draw quad
probe all rgba (5.0, -2.1, 4.0, 0.0) 4
[require]
% Infinities are not allowed in SM1
shader model >= 4.0

19
tests/hlsl/arithmetic-int-uniform.shader_test
View File

@ -100,3 +100,22 @@ float4 main() : SV_TARGET
uniform 0 float4 5.0 -7.0 0.0 -10.0
draw quad
probe all rgba (5.0, 7.0, 0.0, 10.0)
[pixel shader]
uniform float4 a;
uniform float4 b;
float4 main() : sv_target
{
int2 x = a.xz;
int2 y = a.yw;
int2 z = b.xy;
int2 w = b.zw;
return float4(x / y, z % w);
}
[test]
uniform 0 float4 45.0 5.0 50.0 10.0
uniform 4 float4 3.0 8.0 2.0 5.0
draw quad
probe all rgba (9.0, 5.0, 1.0, 3.0)

14
tests/hlsl/arithmetic-int.shader_test
View File

@ -109,3 +109,17 @@ float4 main() : SV_TARGET
[test]
draw quad
probe all rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0)
[pixel shader]
float4 main() : sv_target
{
int2 x = {5, 15};
int2 y = {2, 5};
int2 z = {3, 8};
return float4(x / y, z % y);
}
[test]
draw quad
probe all rgba (2.0, 3.0, 1.0, 3.0)