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: Don't allow manual and automatic cbuffer offset packing.

Browse Source
This commit is contained in:
Francisco Casas 2023-02-21 22:39:24 -03:00 committed by Alexandre Julliard
parent 4448d114ad
commit 60237cb773
Notes: Alexandre Julliard 2023-04-04 22:35:22 +02: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/106
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/vkd3d-shader/hlsl.h
View File

@ -678,6 +678,9 @@ struct hlsl_buffer
unsigned size, used_size;
/* Register of type 'b' on which the buffer is allocated. */
struct hlsl_reg reg;
bool manually_packed_elements;
bool automatically_packed_elements;
};
struct hlsl_ctx

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

@ -2990,6 +2990,25 @@ static void validate_buffer_offsets(struct hlsl_ctx *ctx)
var1->name, var2->name);
}
}
LIST_FOR_EACH_ENTRY(var1, &ctx->extern_vars, struct hlsl_ir_var, extern_entry)
{
buffer = var1->buffer;
if (!buffer)
continue;
if (var1->reg_reservation.offset_type == 'c')
buffer->manually_packed_elements = true;
else
buffer->automatically_packed_elements = true;
if (buffer->manually_packed_elements && buffer->automatically_packed_elements)
{
hlsl_error(ctx, &buffer->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION,
"packoffset() must be specified for all the buffer elements, or none of them.");
break;
}
}
}
static void allocate_buffers(struct hlsl_ctx *ctx)

2
tests/cbuffer.shader_test
View File

@ -305,7 +305,7 @@ draw quad
probe all rgba (512.0, 612.0, 712.0, 812.0)
[pixel shader fail todo]
[pixel shader fail]
// packoffset cannot be used unless all elements use it.
cbuffer buffer
{