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/tpf: Fix used temp registers accounting for dcl_temps.

Browse Source 
Otherwise we always output "dcl_temps 1" even when no temp registers were used.
This commit is contained in:
Nikolay Sivov 2023-10-28 00:06:51 +02:00 committed by Alexandre Julliard
parent f05be8ff12
commit 31346e2cba
Notes: Alexandre Julliard 2023-11-06 23:17:29 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/430
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3461,22 +3461,20 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl
struct register_allocator struct register_allocator
{ {
size_t count, capacity;
/* Highest register index that has been allocated.
* Used to declare sm4 temp count. */
uint32_t max_reg;
struct allocation struct allocation
{ {
uint32_t reg; uint32_t reg;
unsigned int writemask; unsigned int writemask;
unsigned int first_write, last_read; unsigned int first_write, last_read;
} *allocations; } *allocations;
size_t count, capacity;
/* Indexable temps are allocated separately and always keep their index regardless of their /* Indexable temps are allocated separately and always keep their index regardless of their
* lifetime. */ * lifetime. */
size_t indexable_count; size_t indexable_count;
/* Total number of registers allocated so far. Used to declare sm4 temp count. */
uint32_t reg_count;
}; };
static unsigned int get_available_writemask(const struct register_allocator *allocator, static unsigned int get_available_writemask(const struct register_allocator *allocator,
@ -3519,7 +3517,7 @@ static void record_allocation(struct hlsl_ctx *ctx, struct register_allocator *a
allocation->first_write = first_write; allocation->first_write = first_write;
allocation->last_read = last_read; allocation->last_read = last_read;
allocator->max_reg = max(allocator->max_reg, reg_idx); allocator->reg_count = max(allocator->reg_count, reg_idx + 1);
} }
/* reg_size is the number of register components to be reserved, while component_count is the number /* reg_size is the number of register components to be reserved, while component_count is the number
@ -3986,7 +3984,7 @@ static void allocate_temp_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functio
} }
allocate_temp_registers_recurse(ctx, &entry_func->body, &allocator); allocate_temp_registers_recurse(ctx, &entry_func->body, &allocator);
ctx->temp_count = allocator.max_reg + 1; ctx->temp_count = allocator.reg_count;
vkd3d_free(allocator.allocations); vkd3d_free(allocator.allocations);
} }