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/fx: Run full set of constants passes on state block entries values.

Browse Source
This commit is contained in:
Nikolay Sivov 2024-08-07 14:56:15 +02:00 committed by Henri Verbeet
parent f1e65ecc83
commit 2affc8f5c5
Notes: Henri Verbeet 2024-08-12 14:30:49 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/989
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/vkd3d-shader/fx.c
View File

@ -1498,17 +1498,6 @@ static bool replace_state_block_constant(struct hlsl_ctx *ctx, struct hlsl_ir_no
return true; return true;
} }
static void fold_state_value(struct hlsl_ctx *ctx, struct hlsl_state_block_entry *entry)
{
bool progress;
do
{
progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, entry->instrs, NULL);
progress |= hlsl_copy_propagation_execute(ctx, entry->instrs);
} while (progress);
}
enum state_property_component_type enum state_property_component_type
{ {
FX_BOOL, FX_BOOL,
@ -1805,7 +1794,7 @@ static void resolve_fx_4_state_block_values(struct hlsl_ir_var *var, struct hlsl
/* Turn named constants to actual constants. */ /* Turn named constants to actual constants. */
hlsl_transform_ir(ctx, replace_state_block_constant, entry->instrs, &replace_context); hlsl_transform_ir(ctx, replace_state_block_constant, entry->instrs, &replace_context);
fold_state_value(ctx, entry); hlsl_run_const_passes(ctx, entry->instrs);
/* Now cast and run folding again. */ /* Now cast and run folding again. */
@ -1875,7 +1864,7 @@ static void resolve_fx_4_state_block_values(struct hlsl_ir_var *var, struct hlsl
hlsl_src_remove(entry->args); hlsl_src_remove(entry->args);
hlsl_src_from_node(entry->args, cast); hlsl_src_from_node(entry->args, cast);
fold_state_value(ctx, entry); hlsl_run_const_passes(ctx, entry->instrs);
} }
} }