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: Consider register() as manual packing for resource fields.

Browse Source
This commit is contained in:
Francisco Casas
2023-03-01 15:57:31 -03:00
committed by Alexandre Julliard
parent 70ff7aaddd
commit f3e81327dc
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
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2994,10 +2994,11 @@ static void validate_buffer_offsets(struct hlsl_ctx *ctx)
LIST_FOR_EACH_ENTRY(var1, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) LIST_FOR_EACH_ENTRY(var1, &ctx->extern_vars, struct hlsl_ir_var, extern_entry)
{ {
buffer = var1->buffer; buffer = var1->buffer;
if (!buffer) if (!buffer || buffer == ctx->globals_buffer)
continue; continue;
if (var1->reg_reservation.offset_type == 'c') if (var1->reg_reservation.offset_type
|| (var1->data_type->class == HLSL_CLASS_OBJECT && var1->reg_reservation.reg_type))
buffer->manually_packed_elements = true; buffer->manually_packed_elements = true;
else else
buffer->automatically_packed_elements = true; buffer->automatically_packed_elements = true;

8
tests/cbuffer.shader_test
View File

@ -607,7 +607,7 @@ float4 main() : sv_target
} }
% register() can be used instead of packoffset(). % register() can be used instead of packoffset().
[pixel shader todo] [pixel shader]
cbuffer buffer cbuffer buffer
{ {
float4 foo : packoffset(c0); float4 foo : packoffset(c0);
@ -619,7 +619,7 @@ float4 main() : sv_target
return 0; return 0;
} }
[pixel shader todo] [pixel shader]
cbuffer buffer cbuffer buffer
{ {
float4 foo : packoffset(c0); float4 foo : packoffset(c0);
@ -632,7 +632,7 @@ float4 main() : sv_target
} }
% Using register() alone is considered manual packing for resources, so the other fields expect packoffset(). % Using register() alone is considered manual packing for resources, so the other fields expect packoffset().
[pixel shader fail todo] [pixel shader fail]
cbuffer buffer cbuffer buffer
{ {
float4 foo; float4 foo;
@ -644,7 +644,7 @@ float4 main() : sv_target
return 0; return 0;
} }
[pixel shader fail todo] [pixel shader fail]
cbuffer buffer cbuffer buffer
{ {
float4 foo; float4 foo;