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: Allow cbuffer reservations to overlap if only one of them is allocated.

Browse Source
This commit is contained in:
Victor Chiletto 2024-09-26 17:35:12 -03:00 committed by Henri Verbeet
parent 8010ef8771
commit 2ea5f187f9
Notes: Henri Verbeet 2024-10-01 17:35:23 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1129
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5206,7 +5206,8 @@ static void allocate_semantic_registers(struct hlsl_ctx *ctx)
} }
} }
static const struct hlsl_buffer *get_reserved_buffer(struct hlsl_ctx *ctx, uint32_t space, uint32_t index) static const struct hlsl_buffer *get_reserved_buffer(struct hlsl_ctx *ctx,
uint32_t space, uint32_t index, bool allocated_only)
{ {
const struct hlsl_buffer *buffer; const struct hlsl_buffer *buffer;
@ -5214,7 +5215,12 @@ static const struct hlsl_buffer *get_reserved_buffer(struct hlsl_ctx *ctx, uint3
{ {
if (buffer->reservation.reg_type == 'b' if (buffer->reservation.reg_type == 'b'
&& buffer->reservation.reg_space == space && buffer->reservation.reg_index == index) && buffer->reservation.reg_space == space && buffer->reservation.reg_index == index)
{
if (allocated_only && !buffer->reg.allocated)
continue;
return buffer; return buffer;
}
} }
return NULL; return NULL;
} }
@ -5397,8 +5403,8 @@ static void allocate_buffers(struct hlsl_ctx *ctx)
if (reservation->reg_type == 'b') if (reservation->reg_type == 'b')
{ {
const struct hlsl_buffer *reserved_buffer = get_reserved_buffer(ctx, const struct hlsl_buffer *allocated_buffer = get_reserved_buffer(ctx,
reservation->reg_space, reservation->reg_index); reservation->reg_space, reservation->reg_index, true);
unsigned int max_index = get_max_cbuffer_reg_index(ctx); unsigned int max_index = get_max_cbuffer_reg_index(ctx);
if (buffer->reservation.reg_index > max_index) if (buffer->reservation.reg_index > max_index)
@ -5406,14 +5412,14 @@ static void allocate_buffers(struct hlsl_ctx *ctx)
"Buffer reservation cb%u exceeds target's maximum (cb%u).", "Buffer reservation cb%u exceeds target's maximum (cb%u).",
buffer->reservation.reg_index, max_index); buffer->reservation.reg_index, max_index);
if (reserved_buffer && reserved_buffer != buffer) if (allocated_buffer && allocated_buffer != buffer)
{ {
hlsl_error(ctx, &buffer->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, hlsl_error(ctx, &buffer->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS,
"Multiple buffers bound to space %u, index %u.", "Multiple buffers bound to space %u, index %u.",
reservation->reg_space, reservation->reg_index); reservation->reg_space, reservation->reg_index);
hlsl_note(ctx, &reserved_buffer->loc, VKD3D_SHADER_LOG_ERROR, hlsl_note(ctx, &allocated_buffer->loc, VKD3D_SHADER_LOG_ERROR,
"Buffer %s is already bound to space %u, index %u.", "Buffer %s is already bound to space %u, index %u.",
reserved_buffer->name, reservation->reg_space, reservation->reg_index); allocated_buffer->name, reservation->reg_space, reservation->reg_index);
} }
buffer->reg.space = reservation->reg_space; buffer->reg.space = reservation->reg_space;
@ -5430,12 +5436,12 @@ static void allocate_buffers(struct hlsl_ctx *ctx)
else if (!reservation->reg_type) else if (!reservation->reg_type)
{ {
unsigned int max_index = get_max_cbuffer_reg_index(ctx); unsigned int max_index = get_max_cbuffer_reg_index(ctx);
while (get_reserved_buffer(ctx, 0, index)) while (get_reserved_buffer(ctx, 0, index, false))
++index; ++index;
if (index > max_index) if (index > max_index)
hlsl_error(ctx, &buffer->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, hlsl_error(ctx, &buffer->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION,
"Too many buffers allocated, target's maximum is %u.", max_index); "Too many buffers reserved, target's maximum is %u.", max_index);
buffer->reg.space = 0; buffer->reg.space = 0;
buffer->reg.index = index; buffer->reg.index = index;

2
tests/hlsl/register-reservations-numeric.shader_test
View File

@ -824,7 +824,7 @@ float4 main(uniform float param) : sv_target
return glob * param * a * b * c * d * e * f * g * h * i * j * k * l; return glob * param * a * b * c * d * e * f * g * h * i * j * k * l;
} }
[pixel shader todo] [pixel shader]
// Multiple cbuffers can share the same reservation if only one of them is actually used. // Multiple cbuffers can share the same reservation if only one of them is actually used.
cbuffer buf0 : register(b0) cbuffer buf0 : register(b0)