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/hlsl: Use early return in allocate_register().

Browse Source 
Partly to avoid a spurious maybe-uninitialized warning, and partly because it's a more idiomatic structure.
This commit is contained in:
Elizabeth Figura 2024-10-23 16:21:40 -05:00 committed by Henri Verbeet
parent 08253504dc
commit 3511b54040
Notes: Henri Verbeet 2024-10-28 18:14:14 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1227
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4567,38 +4567,38 @@ static struct hlsl_reg allocate_register(struct hlsl_ctx *ctx, struct register_a
unsigned int first_write, unsigned int last_read, unsigned int reg_size, unsigned int first_write, unsigned int last_read, unsigned int reg_size,
unsigned int component_count, int mode, bool force_align) unsigned int component_count, int mode, bool force_align)
{ {
struct hlsl_reg ret = {.allocation_size = 1, .allocated = true};
unsigned int required_size = force_align ? 4 : reg_size; unsigned int required_size = force_align ? 4 : reg_size;
unsigned int writemask = 0, pref; unsigned int pref;
struct hlsl_reg ret = {0};
uint32_t reg_idx;
VKD3D_ASSERT(component_count <= reg_size); VKD3D_ASSERT(component_count <= reg_size);
pref = allocator->prioritize_smaller_writemasks ? 4 : required_size; pref = allocator->prioritize_smaller_writemasks ? 4 : required_size;
for (; pref >= required_size; --pref) for (; pref >= required_size; --pref)
{ {
for (reg_idx = 0; pref == required_size || reg_idx < allocator->reg_count; ++reg_idx) for (uint32_t reg_idx = 0; reg_idx < allocator->reg_count; ++reg_idx)
{ {
unsigned int available_writemask = get_available_writemask(allocator, unsigned int available_writemask = get_available_writemask(allocator,
first_write, last_read, reg_idx, mode); first_write, last_read, reg_idx, mode);
if (vkd3d_popcount(available_writemask) >= pref) if (vkd3d_popcount(available_writemask) >= pref)
{ {
writemask = hlsl_combine_writemasks(available_writemask, (1u << reg_size) - 1); unsigned int writemask = hlsl_combine_writemasks(available_writemask,
break; vkd3d_write_mask_from_component_count(reg_size));
}
}
if (writemask)
break;
}
VKD3D_ASSERT(vkd3d_popcount(writemask) == reg_size);
record_allocation(ctx, allocator, reg_idx, writemask, first_write, last_read, mode);
ret.id = reg_idx; ret.id = reg_idx;
ret.allocation_size = 1; ret.writemask = hlsl_combine_writemasks(writemask,
ret.writemask = hlsl_combine_writemasks(writemask, (1u << component_count) - 1); vkd3d_write_mask_from_component_count(component_count));
ret.allocated = true; record_allocation(ctx, allocator, reg_idx, writemask, first_write, last_read, mode);
return ret;
}
}
}
ret.id = allocator->reg_count;
ret.writemask = vkd3d_write_mask_from_component_count(component_count);
record_allocation(ctx, allocator, allocator->reg_count,
vkd3d_write_mask_from_component_count(reg_size), first_write, last_read, mode);
return ret; return ret;
} }