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/ir: Run validation after inserting the alpha test.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-05 20:17:59 +02:00 committed by Henri Verbeet
parent 5c0d640d18
commit 03ab0156a2
Notes: Henri Verbeet 2024-09-11 15:34:39 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1058
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/vkd3d-shader/ir.c
View File

@ -5609,8 +5609,9 @@ static enum vkd3d_result insert_alpha_test_before_ret(struct vsir_program *progr
} }
static enum vkd3d_result vsir_program_insert_alpha_test(struct vsir_program *program, static enum vkd3d_result vsir_program_insert_alpha_test(struct vsir_program *program,
struct vkd3d_shader_message_context *message_context) struct vsir_normalisation_context *ctx)
{ {
struct vkd3d_shader_message_context *message_context = ctx->message_context;
const struct vkd3d_shader_parameter1 *func = NULL, *ref = NULL; const struct vkd3d_shader_parameter1 *func = NULL, *ref = NULL;
static const struct vkd3d_shader_location no_loc; static const struct vkd3d_shader_location no_loc;
enum vkd3d_shader_comparison_func compare_func; enum vkd3d_shader_comparison_func compare_func;
@ -6657,7 +6658,6 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t
.compile_info = compile_info, .compile_info = compile_info,
.message_context = message_context, .message_context = message_context,
}; };
enum vkd3d_result result;
vsir_transform(&ctx, vsir_program_lower_instructions); vsir_transform(&ctx, vsir_program_lower_instructions);
@ -6689,18 +6689,10 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t
vsir_transform(&ctx, vsir_program_flatten_control_flow_constructs); vsir_transform(&ctx, vsir_program_flatten_control_flow_constructs);
} }
if (ctx.result < 0) vsir_transform(&ctx, vsir_program_insert_alpha_test);
return ctx.result;
if ((result = vsir_program_insert_alpha_test(program, message_context)) < 0)
return result;
if (TRACE_ON()) if (TRACE_ON())
vkd3d_shader_trace(program); vkd3d_shader_trace(program);
if ((result = vsir_program_validate(program, config_flags, return ctx.result;
compile_info->source_name, message_context)) < 0)
return result;
return result;
} }