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: Skip unallocated variables when looking for reservation conflicts.

Browse Source
This commit is contained in:
Zebediah Figura
2023-06-27 13:14:37 -05:00
committed by Alexandre Julliard
parent aec9ea085e
commit d4b5e79c8b
Notes: Alexandre Julliard 2023-07-13 23:33:33 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/253
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3689,7 +3689,7 @@ static void allocate_buffers(struct hlsl_ctx *ctx)
} }
static const struct hlsl_ir_var *get_allocated_object(struct hlsl_ctx *ctx, enum hlsl_regset regset, static const struct hlsl_ir_var *get_allocated_object(struct hlsl_ctx *ctx, enum hlsl_regset regset,
uint32_t index) uint32_t index, bool allocated_only)
{ {
const struct hlsl_ir_var *var; const struct hlsl_ir_var *var;
unsigned int start, count; unsigned int start, count;
@ -3703,6 +3703,9 @@ static const struct hlsl_ir_var *get_allocated_object(struct hlsl_ctx *ctx, enum
* bound there even if the reserved vars aren't used. */ * bound there even if the reserved vars aren't used. */
start = var->reg_reservation.reg_index; start = var->reg_reservation.reg_index;
count = var->data_type->reg_size[regset]; count = var->data_type->reg_size[regset];
if (!var->regs[regset].allocated && allocated_only)
continue;
} }
else if (var->regs[regset].allocated) else if (var->regs[regset].allocated)
{ {
@ -3743,6 +3746,7 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_regset regset)
if (count == 0) if (count == 0)
continue; continue;
/* The variable was already allocated if it has a reservation. */
if (var->regs[regset].allocated) if (var->regs[regset].allocated)
{ {
const struct hlsl_ir_var *reserved_object, *last_reported = NULL; const struct hlsl_ir_var *reserved_object, *last_reported = NULL;
@ -3761,7 +3765,10 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_regset regset)
{ {
index = var->regs[regset].id + i; index = var->regs[regset].id + i;
reserved_object = get_allocated_object(ctx, regset, index); /* get_allocated_object() may return "var" itself, but we
* actually want that, otherwise we'll end up reporting the
* same conflict between the same two variables twice. */
reserved_object = get_allocated_object(ctx, regset, index, true);
if (reserved_object && reserved_object != var && reserved_object != last_reported) if (reserved_object && reserved_object != var && reserved_object != last_reported)
{ {
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS,
@ -3780,7 +3787,7 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_regset regset)
while (available < count) while (available < count)
{ {
if (get_allocated_object(ctx, regset, index)) if (get_allocated_object(ctx, regset, index, false))
available = 0; available = 0;
else else
++available; ++available;

4
tests/hlsl/register-reservations.shader_test
View File

@ -144,7 +144,7 @@ draw quad
probe all rgba (2.0, 2.0, 2.0, 99.0) probe all rgba (2.0, 2.0, 2.0, 99.0)
[pixel shader todo] [pixel shader]
Texture2D tex1 : register(t2); Texture2D tex1 : register(t2);
Texture2D tex2 : register(t2); Texture2D tex2 : register(t2);
@ -154,5 +154,5 @@ float4 main() : sv_target
} }
[test] [test]
todo draw quad draw quad
probe all rgba (2.0, 2.0, 2.0, 99.0) probe all rgba (2.0, 2.0, 2.0, 99.0)