wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Handle reserved vars specially in get_allocated_object().

Browse Source
This commit is contained in:
Zebediah Figura
2023-06-21 12:00:39 -05:00
committed by Alexandre Julliard
parent 883ab880e3
commit 1c1f1094a5
Notes: Alexandre Julliard 2023-06-22 22:04:01 +02:00 
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/244
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3626,11 +3626,23 @@ static const struct hlsl_ir_var *get_allocated_object(struct hlsl_ctx *ctx, enum
LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry)
{ {
if (!var->regs[regset].allocated) if (var->reg_reservation.reg_type == get_regset_name(regset)
continue; && var->data_type->reg_size[regset])
{
/* Vars with a reservation prevent non-reserved vars from being
* bound there even if the reserved vars aren't used. */
start = var->reg_reservation.reg_index;
count = var->data_type->reg_size[regset];
}
else if (var->regs[regset].allocated)
{
start = var->regs[regset].id; start = var->regs[regset].id;
count = var->regs[regset].bind_count; count = var->regs[regset].bind_count;
}
else
{
continue;
}
if (start <= index && index < start + count) if (start <= index && index < start + count)
return var; return var;