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/ir: Use iterators in vsir_program_validate().

Browse Source
This commit is contained in:
Francisco Casas
2025-08-05 22:33:30 -04:00
committed by Henri Verbeet
parent d3ad3e071a
commit 4dcf0b7d05
Notes: Henri Verbeet 2025-08-21 16:35:05 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1675
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11837,14 +11837,12 @@ static const struct vsir_validator_instruction_desc vsir_validator_instructions[
[VSIR_OP_SWITCH_MONOLITHIC] = {0, ~0u, vsir_validate_switch_monolithic}, [VSIR_OP_SWITCH_MONOLITHIC] = {0, ~0u, vsir_validate_switch_monolithic},
}; };
static void vsir_validate_instruction(struct validation_context *ctx) static void vsir_validate_instruction(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction)
{ {
const struct vkd3d_shader_version *version = &ctx->program->shader_version; const struct vkd3d_shader_version *version = &ctx->program->shader_version;
const struct vkd3d_shader_instruction *instruction;
size_t i; size_t i;
instruction = &ctx->program->instructions.elements[ctx->instruction_idx];
for (i = 0; i < instruction->dst_count; ++i) for (i = 0; i < instruction->dst_count; ++i)
vsir_validate_dst_param(ctx, &instruction->dst[i]); vsir_validate_dst_param(ctx, &instruction->dst[i]);
@@ -11933,6 +11931,8 @@ enum vkd3d_result vsir_program_validate(struct vsir_program *program, uint64_t c
.inner_tess_idxs[0] = ~0u, .inner_tess_idxs[0] = ~0u,
.inner_tess_idxs[1] = ~0u, .inner_tess_idxs[1] = ~0u,
}; };
struct vsir_program_iterator it = vsir_program_iterator(&program->instructions);
struct vkd3d_shader_instruction *ins;
unsigned int i; unsigned int i;
if (!(config_flags & VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION)) if (!(config_flags & VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION))
@@ -12041,9 +12041,13 @@ enum vkd3d_result vsir_program_validate(struct vsir_program *program, uint64_t c
ctx.invalid_instruction_idx = false; ctx.invalid_instruction_idx = false;
for (ctx.instruction_idx = 0; ctx.instruction_idx < program->instructions.count ctx.instruction_idx = 0;
&& ctx.status != VKD3D_ERROR_OUT_OF_MEMORY; ++ctx.instruction_idx) for (ins = vsir_program_iterator_head(&it); ins && ctx.status != VKD3D_ERROR_OUT_OF_MEMORY;
vsir_validate_instruction(&ctx); ins = vsir_program_iterator_next(&it))
{
vsir_validate_instruction(&ctx, ins);
++ctx.instruction_idx;
}
ctx.invalid_instruction_idx = true; ctx.invalid_instruction_idx = true;