wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Implement constant folding of 'reinterpret' expressions.

Browse Source 
As encountered in tests/hlsl/frexp.shader_test.
This commit is contained in:
Henri Verbeet
2025-09-03 16:25:47 +02:00
parent e330ad2ac7
commit 23ee29a953
Notes: Henri Verbeet 2025-09-09 15:10:32 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1716
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/vkd3d-shader/hlsl_constant_ops.c
View File

@@ -508,6 +508,19 @@ static bool fold_rcp(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons
return true; return true;
} }
static bool fold_reinterpret(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src)
{
unsigned int k;
for (k = 0; k < dst_type->e.numeric.dimx; ++k)
{
dst->u[k] = src->value.u[k];
}
return true;
}
static bool fold_rsq(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, static bool fold_rsq(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type,
const struct hlsl_ir_constant *src, const struct vkd3d_shader_location *loc) const struct hlsl_ir_constant *src, const struct vkd3d_shader_location *loc)
{ {
@@ -1393,6 +1406,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
success = fold_rcp(ctx, &res, instr->data_type, arg1, &instr->loc); success = fold_rcp(ctx, &res, instr->data_type, arg1, &instr->loc);
break; break;
case HLSL_OP1_REINTERPRET:
success = fold_reinterpret(ctx, &res, instr->data_type, arg1);
break;
case HLSL_OP1_RSQ: case HLSL_OP1_RSQ:
success = fold_rsq(ctx, &res, instr->data_type, arg1, &instr->loc); success = fold_rsq(ctx, &res, instr->data_type, arg1, &instr->loc);
break; break;

14
tests/hlsl/frexp.shader_test
View File

@@ -55,7 +55,7 @@ uniform 0 uint4 0x0007ffff 0 0 0
todo(sm<4 | msl & sm>=6) draw quad todo(sm<4 | msl & sm>=6) draw quad
probe (0, 0) f32(0, 0, 0, 0) probe (0, 0) f32(0, 0, 0, 0)
[pixel shader todo(sm<4)] [pixel shader]
float4 main() : sv_target float4 main() : sv_target
{ {
int arg = 7604; int arg = 7604;
@@ -66,10 +66,10 @@ float4 main() : sv_target
} }
[test] [test]
todo(sm<4) draw quad draw quad
probe (0, 0) f32(13.0, 0.0, 0.0, 0.0) probe (0, 0) f32(13.0, 0.0, 0.0, 0.0)
[pixel shader todo(sm<4)] [pixel shader]
float4 main() : sv_target float4 main() : sv_target
{ {
bool arg = true; bool arg = true;
@@ -80,11 +80,11 @@ float4 main() : sv_target
} }
[test] [test]
todo(sm<4) draw quad draw quad
if(sm<4) probe (0, 0) f32(0.0, 1.0, 0.0, 0.0) if(sm<4) todo probe (0, 0) f32(0.0, 1.0, 0.0, 0.0)
if(sm>=4) probe (0, 0) f32(1.0, 1.0, 0.0, 0.0) if(sm>=4) probe (0, 0) f32(1.0, 1.0, 0.0, 0.0)
[pixel shader todo(sm<4)] [pixel shader]
float4 main() : sv_target float4 main() : sv_target
{ {
half arg = 3.141; half arg = 3.141;
@@ -95,7 +95,7 @@ float4 main() : sv_target
} }
[test] [test]
todo(sm<4) draw quad draw quad
probe (0, 0) f32(2.0, 0.785250008, 0.0, 0.0) probe (0, 0) f32(2.0, 0.785250008, 0.0, 0.0)
[require] [require]