wine-commits April 2023

wine-commits@winehq.org

1 participants
817 discussions

Alexandre Julliard : msvcrt: Use the fabs()/fabsf() implementation from the bundled musl library.
by Alexandre Julliard 04 Apr '23

04 Apr '23

Module: wine Branch: master Commit: b7228259f839881799cadbab8a6c80f5cf7ac12c URL: https://gitlab.winehq.org/wine/wine/-/commit/b7228259f839881799cadbab8a6c80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 14:35:11 2023 +0200 msvcrt: Use the fabs()/fabsf() implementation from the bundled musl library. --- dlls/crtdll/Makefile.in | 2 +- dlls/msvcr100/Makefile.in | 2 +- dlls/msvcr110/Makefile.in | 2 +- dlls/msvcr120/Makefile.in | 2 +- dlls/msvcr70/Makefile.in | 2 +- dlls/msvcr71/Makefile.in | 2 +- dlls/msvcr80/Makefile.in | 2 +- dlls/msvcr90/Makefile.in | 2 +- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/math.c | 28 ---------------------------- dlls/msvcrtd/Makefile.in | 2 +- dlls/ucrtbase/Makefile.in | 2 +- 12 files changed, 11 insertions(+), 39 deletions(-) diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index d54e8d49964..efb835749b6 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -D_CRTDLL -D_CRTIMP= MODULE = crtdll.dll -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index d17aa79b3d7..b7ed6c9cf87 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr100.dll IMPORTLIB = msvcr100 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 0bc15e27d94..1337b52224a 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr110.dll IMPORTLIB = msvcr110 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index cc3d5b2bdff..f854f0d5417 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr120.dll IMPORTLIB = msvcr120 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index 5782a64bf03..9415d5b5b66 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr70.dll IMPORTLIB = msvcr70 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index f849158e2ee..6079e87841f 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr71.dll IMPORTLIB = msvcr71 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index b3c44b3a530..2bf999f37f1 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr80.dll IMPORTLIB = msvcr80 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 1f7ba4cdcde..0faac8f4150 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr90.dll IMPORTLIB = msvcr90 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 63e6630d7bd..ad42e217d56 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcrt.dll IMPORTLIB = msvcrt -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 C_SRCS = \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 854403a71bf..2bbdcdcc7d3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2075,22 +2075,6 @@ float CDECL modff( float x, float *iptr ) #endif -#if !defined(__i386__) && !defined(__x86_64__) && (_MSVCR_VER == 0 || _MSVCR_VER >= 110) - -/********************************************************************* - * fabsf (MSVCRT.@) - * - * Copied from musl: src/math/fabsf.c - */ -float CDECL fabsf( float x ) -{ - union { float f; UINT32 i; } u = { x }; - u.i &= 0x7fffffff; - return u.f; -} - -#endif - /********************************************************************* * acos (MSVCRT.@) * @@ -5095,18 +5079,6 @@ float CDECL fmaf( float x, float y, float z ) return u.f; } -/********************************************************************* - * fabs (MSVCRT.@) - * - * Copied from musl: src/math/fabsf.c - */ -double CDECL fabs( double x ) -{ - union { double f; UINT64 i; } u = { x }; - u.i &= ~0ull >> 1; - return u.f; -} - /********************************************************************* * frexp (MSVCRT.@) * diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in index 95f0bca93b4..994195eebc6 100644 --- a/dlls/msvcrtd/Makefile.in +++ b/dlls/msvcrtd/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= -D_DEBUG= MODULE = msvcrtd.dll IMPORTLIB = msvcrtd -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll PARENTSRC = ../msvcrt DELAYIMPORTS = advapi32 user32 diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index abab9d4f02c..e9cdf6127a0 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = ucrtbase.dll IMPORTLIB = ucrtbase -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt

1 0

Alexandre Julliard : libs: Import the math library from upstream musl 1.2.3.
by Alexandre Julliard 04 Apr '23

04 Apr '23

1 0

Paul Gofman : winegstreamer: Fix check for non-zero padding in h264 transform.
by Alexandre Julliard 04 Apr '23

04 Apr '23

Module: wine Branch: master Commit: 35f9091beee52cbd7cde0b5e7c2c8bec5b1259dd URL: https://gitlab.winehq.org/wine/wine/-/commit/35f9091beee52cbd7cde0b5e7c2c8b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 3 17:23:43 2023 -0600 winegstreamer: Fix check for non-zero padding in h264 transform. --- dlls/winegstreamer/h264_decoder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 439701098ad..7d9c38837d3 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -183,7 +183,8 @@ static HRESULT fill_output_media_type(struct h264_decoder *decoder, IMFMediaType } if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, NULL)) - && !IsRectEmpty(&wg_format->u.video.padding)) + && (wg_format->u.video.padding.left || wg_format->u.video.padding.right || wg_format->u.video.padding.top + || wg_format->u.video.padding.bottom)) { MFVideoArea aperture = {

1 0

Francisco Casas : vkd3d-shader/hlsl: Consider register() as manual packing for resource fields.
by Alexandre Julliard 04 Apr '23

04 Apr '23

Module: vkd3d Branch: master Commit: f3e81327dc775e4e794618558696971ee1741fdc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f3e81327dc775e4e7946185586969… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Mar 1 15:57:31 2023 -0300 vkd3d-shader/hlsl: Consider register() as manual packing for resource fields. --- libs/vkd3d-shader/hlsl_codegen.c | 5 +++-- tests/cbuffer.shader_test | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 610b576c..5d7e426f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -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) { buffer = var1->buffer; - if (!buffer) + if (!buffer || buffer == ctx->globals_buffer) 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; else buffer->automatically_packed_elements = true; diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test index e95a5235..9cf42d9d 100644 --- a/tests/cbuffer.shader_test +++ b/tests/cbuffer.shader_test @@ -607,7 +607,7 @@ float4 main() : sv_target } % register() can be used instead of packoffset(). -[pixel shader todo] +[pixel shader] cbuffer buffer { float4 foo : packoffset(c0); @@ -619,7 +619,7 @@ float4 main() : sv_target return 0; } -[pixel shader todo] +[pixel shader] cbuffer buffer { 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(). -[pixel shader fail todo] +[pixel shader fail] cbuffer buffer { float4 foo; @@ -644,7 +644,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail todo] +[pixel shader fail] cbuffer buffer { float4 foo;

1 0

Francisco Casas : tests: Test packoffset() with resources inside cbuffers.
by Alexandre Julliard 04 Apr '23

04 Apr '23

Module: vkd3d Branch: master Commit: 70ff7aadddb8b9787d21b9d044fade0482cb9bca URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/70ff7aadddb8b9787d21b9d044fad… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Mar 1 14:28:12 2023 -0300 tests: Test packoffset() with resources inside cbuffers. --- tests/cbuffer.shader_test | 259 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 259 insertions(+) diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test index 8c6e1724..e95a5235 100644 --- a/tests/cbuffer.shader_test +++ b/tests/cbuffer.shader_test @@ -444,3 +444,262 @@ float4 main() : sv_target { return 0; } + + +[texture 0] +size (1, 1) +0.0 0.0 0.0 4.0 + +[sampler 0] +filter linear linear linear +address clamp clamp clamp + + +[pixel shader] +// Resources are allowed inside constant buffers but they behave as regular resources. +cbuffer buffer +{ + float4 a; + Texture2D tex; + sampler sam; + float4 b; +} + +float4 main() : sv_target +{ + return a + b + tex.Sample(sam, float2(0, 0)); +} + +[test] +uniform 0 float4 1.0 0.0 0.0 0.0 +uniform 4 float4 0.0 2.0 0.0 0.0 +uniform 8 float4 0.0 0.0 3.0 0.0 +draw quad +probe all rgba (1.0, 2.0, 0.0, 4.0) + + +% packoffset() cannot be used to specify other types of registers +[pixel shader fail] +cbuffer buffer +{ + sampler sam : packoffset(s0); +} + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +cbuffer buffer +{ + Texture2D tex : packoffset(t0); +} + +float4 main() : sv_target +{ + return 0; +} + + +[texture 0] +size (1, 1) +1.0 1.0 1.0 1.0 + +[texture 1] +size (1, 1) +2.0 2.0 2.0 2.0 + + +[pixel shader] +// packoffset() can be used in Textures, doesn't change the allocated t register. +cbuffer buffer +{ + Texture2D tex : packoffset(c1); +} + +float4 main() : sv_target +{ + return tex.Load(int3(0, 0, 0)); +} + +[test] +draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) + + +% Samplers cannot have packoffset(), unless register() is also specified, or they are not used. +% Note: In SM1 the rules are different: packoffset() is allowed for samplers, but they cannot be +% used together with other numeric fields, which seems like a bug. +[pixel shader fail todo] +Texture2D tex; + +cbuffer buffer +{ + sampler sam : packoffset(c1); +} + +float4 main() : sv_target +{ + return tex.Sample(sam, float2(0, 0)); +} + +[pixel shader todo] +Texture2D tex; + +cbuffer buffer +{ + sampler sam : packoffset(c1) : register(s0); +} + +float4 main() : sv_target +{ + return tex.Sample(sam, float2(0, 0)); +} + +[pixel shader] +cbuffer buffer +{ + sampler sam : packoffset(c1); +} + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader] +cbuffer buffer +{ + sampler sam : packoffset(c1); + float4 a : packoffset(c0); +} + +float4 main() : sv_target +{ + return a; +} + + +% When packoffset is used in one field, resources are also expected to have a reservation. +[pixel shader fail] +cbuffer buffer +{ + float4 foo : packoffset(c0); + Texture2D tex; +} + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +cbuffer buffer +{ + float4 foo : packoffset(c0); + sampler sam; +} + +float4 main() : sv_target +{ + return 0; +} + +% register() can be used instead of packoffset(). +[pixel shader todo] +cbuffer buffer +{ + float4 foo : packoffset(c0); + Texture2D tex : register(t1); +} + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader todo] +cbuffer buffer +{ + float4 foo : packoffset(c0); + sampler sam : register(s1); +} + +float4 main() : sv_target +{ + return 0; +} + +% Using register() alone is considered manual packing for resources, so the other fields expect packoffset(). +[pixel shader fail todo] +cbuffer buffer +{ + float4 foo; + Texture2D tex : register(t1); +} + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail todo] +cbuffer buffer +{ + float4 foo; + sampler sam : register(s1); +} + +float4 main() : sv_target +{ + return 0; +} + +% Using register() alone is not considered manual packing for non-resources. +[pixel shader] +cbuffer buffer +{ + float4 foo : register(c0); + Texture2D tex; +} + +float4 main() : sv_target +{ + return 0; +} + + +[require] +shader model >= 5.0 + +[texture 0] +size (1, 1) +0.0 0.0 0.0 0.5 + +[pixel shader todo] +struct apple +{ + float2 a; + Texture2D tex; + float b; +}; + +cbuffer buffer +{ + float4 foo : packoffset(c3); + struct apple bar : packoffset(c1); +} + +float4 main() : sv_target +{ + return 10 * foo + float4(bar.a, 0, 0) + float4(0, 0, bar.b, 0) + bar.tex.Load(int3(0, 0, 0)); +} + +[test] +uniform 0 float4 0.0 1.0 2.0 3.0 +uniform 4 float4 4.0 5.0 6.0 7.0 +uniform 8 float4 8.0 9.0 10.0 11.0 +uniform 12 float4 12.0 13.0 14.0 15.0 +todo draw quad +todo probe all rgba (124.0, 135.0, 146.0, 150.5)

1 0

Francisco Casas : vkd3d-shader/hlsl: Ignore packoffset() contents for SM1.
by Alexandre Julliard 04 Apr '23

04 Apr '23

Module: vkd3d Branch: master Commit: bf4a125087c378ad9e1727bf28723c126545f3a6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bf4a125087c378ad9e1727bf28723… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Feb 28 19:03:04 2023 -0300 vkd3d-shader/hlsl: Ignore packoffset() contents for SM1. --- libs/vkd3d-shader/hlsl.y | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f3196b5b..79ec970a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1107,6 +1107,9 @@ static struct hlsl_reg_reservation parse_packoffset(struct hlsl_ctx *ctx, const struct hlsl_reg_reservation reservation = {0}; char *endptr; + if (ctx->profile->major_version < 4) + return reservation; + reservation.offset_index = strtoul(reg_string + 1, &endptr, 10); if (*endptr) {

1 0

Francisco Casas : vkd3d-shader/hlsl: Don't allow manual and automatic cbuffer offset packing.
by Alexandre Julliard 04 Apr '23

04 Apr '23

Module: vkd3d Branch: master Commit: 60237cb77324126dbce3ef0744880fa9fad8db8d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/60237cb77324126dbce3ef0744880… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Feb 21 22:39:24 2023 -0300 vkd3d-shader/hlsl: Don't allow manual and automatic cbuffer offset packing. --- libs/vkd3d-shader/hlsl.h | 3 +++ libs/vkd3d-shader/hlsl_codegen.c | 19 +++++++++++++++++++ tests/cbuffer.shader_test | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index a19a65c5..38a7715e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -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 diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2e10aa55..610b576c 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -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) diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test index d8cfc351..8c6e1724 100644 --- a/tests/cbuffer.shader_test +++ b/tests/cbuffer.shader_test @@ -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 {

1 0

Francisco Casas : vkd3d-shader/hlsl: Detect overlaps in cbuffer offsets.
by Alexandre Julliard 04 Apr '23

04 Apr '23

Module: vkd3d Branch: master Commit: 4448d114ad6b279c8631aa9229fb04dda4d92561 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4448d114ad6b279c8631aa9229fb0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Feb 21 21:53:32 2023 -0300 vkd3d-shader/hlsl: Detect overlaps in cbuffer offsets. --- libs/vkd3d-shader/hlsl_codegen.c | 42 ++++++++++++++++++++++++++++++++++++++++ tests/cbuffer.shader_test | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index eafc06e2..2e10aa55 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2952,6 +2952,46 @@ static void calculate_buffer_offset(struct hlsl_ctx *ctx, struct hlsl_ir_var *va buffer->used_size = max(buffer->used_size, var->buffer_offset + var_reg_size); } +static void validate_buffer_offsets(struct hlsl_ctx *ctx) +{ + struct hlsl_ir_var *var1, *var2; + struct hlsl_buffer *buffer; + + LIST_FOR_EACH_ENTRY(var1, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + if (!var1->is_uniform || var1->data_type->class == HLSL_CLASS_OBJECT) + continue; + + buffer = var1->buffer; + if (!buffer->used_size) + continue; + + LIST_FOR_EACH_ENTRY(var2, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + unsigned int var1_reg_size, var2_reg_size; + + if (!var2->is_uniform || var2->data_type->class == HLSL_CLASS_OBJECT) + continue; + + if (var1 == var2 || var1->buffer != var2->buffer) + continue; + + /* This is to avoid reporting the error twice for the same pair of overlapping variables. */ + if (strcmp(var1->name, var2->name) >= 0) + continue; + + var1_reg_size = var1->data_type->reg_size[HLSL_REGSET_NUMERIC]; + var2_reg_size = var2->data_type->reg_size[HLSL_REGSET_NUMERIC]; + + if (var1->buffer_offset < var2->buffer_offset + var2_reg_size + && var2->buffer_offset < var1->buffer_offset + var1_reg_size) + hlsl_error(ctx, &buffer->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid packoffset() reservation: Variables %s and %s overlap.", + var1->name, var2->name); + } + } +} + static void allocate_buffers(struct hlsl_ctx *ctx) { struct hlsl_buffer *buffer; @@ -2969,6 +3009,8 @@ static void allocate_buffers(struct hlsl_ctx *ctx) } } + validate_buffer_offsets(ctx); + LIST_FOR_EACH_ENTRY(buffer, &ctx->buffers, struct hlsl_buffer, entry) { if (!buffer->used_size) diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test index bf711629..d8cfc351 100644 --- a/tests/cbuffer.shader_test +++ b/tests/cbuffer.shader_test @@ -106,7 +106,7 @@ draw quad probe all rgba (0.0, 4.0, 5.0, 6.0) -[pixel shader fail todo] +[pixel shader fail] // Elements cannot overlap if buffer is used. cbuffer buffer {

1 0

Francisco Casas : vkd3d-shader/hlsl: Support packoffset().
by Alexandre Julliard 04 Apr '23

04 Apr '23

Module: vkd3d Branch: master Commit: 7777c32cac7e9a61e38a79c8efb97632f3b2a4dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7777c32cac7e9a61e38a79c8efb97… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Feb 21 17:08:39 2023 -0300 vkd3d-shader/hlsl: Support packoffset(). --- libs/vkd3d-shader/hlsl_codegen.c | 46 ++++++++++++++++++++++++++++++++++------ tests/cbuffer.shader_test | 22 +++++++++---------- 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 411aa79f..eafc06e2 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2905,17 +2905,51 @@ static const struct hlsl_buffer *get_reserved_buffer(struct hlsl_ctx *ctx, uint3 return NULL; } -static void calculate_buffer_offset(struct hlsl_ir_var *var) +static void calculate_buffer_offset(struct hlsl_ctx *ctx, struct hlsl_ir_var *var) { + unsigned int var_reg_size = var->data_type->reg_size[HLSL_REGSET_NUMERIC]; + enum hlsl_type_class var_class = var->data_type->class; struct hlsl_buffer *buffer = var->buffer; - buffer->size = hlsl_type_get_sm4_offset(var->data_type, buffer->size); + if (var->reg_reservation.offset_type == 'c') + { + if (var->reg_reservation.offset_index % 4) + { + if (var_class == HLSL_CLASS_MATRIX) + { + hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "packoffset() reservations with matrix types must be aligned with the beginning of a register."); + } + else if (var_class == HLSL_CLASS_ARRAY) + { + hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "packoffset() reservations with array types must be aligned with the beginning of a register."); + } + else if (var_class == HLSL_CLASS_STRUCT) + { + hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "packoffset() reservations with struct types must be aligned with the beginning of a register."); + } + else if (var_class == HLSL_CLASS_VECTOR) + { + unsigned int aligned_offset = hlsl_type_get_sm4_offset(var->data_type, var->reg_reservation.offset_index); + + if (var->reg_reservation.offset_index != aligned_offset) + hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "packoffset() reservations with vector types cannot span multiple registers."); + } + } + var->buffer_offset = var->reg_reservation.offset_index; + } + else + { + var->buffer_offset = hlsl_type_get_sm4_offset(var->data_type, buffer->size); + } - var->buffer_offset = buffer->size; TRACE("Allocated buffer offset %u to %s.\n", var->buffer_offset, var->name); - buffer->size += var->data_type->reg_size[HLSL_REGSET_NUMERIC]; + buffer->size = max(buffer->size, var->buffer_offset + var_reg_size); if (var->last_read) - buffer->used_size = buffer->size; + buffer->used_size = max(buffer->used_size, var->buffer_offset + var_reg_size); } static void allocate_buffers(struct hlsl_ctx *ctx) @@ -2931,7 +2965,7 @@ static void allocate_buffers(struct hlsl_ctx *ctx) if (var->is_param) var->buffer = ctx->params_buffer; - calculate_buffer_offset(var); + calculate_buffer_offset(ctx, var); } } diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test index 628a441a..bf711629 100644 --- a/tests/cbuffer.shader_test +++ b/tests/cbuffer.shader_test @@ -152,7 +152,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 uniform 8 float4 9.0 10.0 11.0 12.0 draw quad -todo probe all rgba (509, 610, 711, 812) +probe all rgba (509, 610, 711, 812) [pixel shader] @@ -180,7 +180,7 @@ uniform 4 float4 4.0 5.0 6.0 7.0 uniform 8 float4 8.0 9.0 10.0 11.0 uniform 12 float4 12.0 13.0 14.0 15.0 draw quad -todo probe all rgba (12468.0, 13509.0, 14010.0, 15011.0) +probe all rgba (12468.0, 13509.0, 14010.0, 15011.0) [pixel shader] @@ -197,10 +197,10 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 draw quad -todo probe all rgba (2.0, 3.0, 2.0, 3.0) +probe all rgba (2.0, 3.0, 2.0, 3.0) -[pixel shader fail todo] +[pixel shader fail] // Elements must respect register boundaries. cbuffer buffer { @@ -213,7 +213,7 @@ float4 main() : sv_target } -[pixel shader fail todo] +[pixel shader fail] // Matrices must be aligned. cbuffer buffer { @@ -226,7 +226,7 @@ float4 main() : sv_target } -[pixel shader fail todo] +[pixel shader fail] // Arrays must be aligned. cbuffer buffer { @@ -239,7 +239,7 @@ float4 main() : sv_target } -[pixel shader fail todo] +[pixel shader fail] // Structs must be aligned. struct apple { @@ -257,7 +257,7 @@ float4 main() : sv_target } -[pixel shader fail todo] +[pixel shader fail] // Invalid offset on unused buffer. cbuffer buffer { @@ -270,7 +270,7 @@ float4 main() : sv_target } -[pixel shader fail todo] +[pixel shader fail] // Invalid offset on unused variable. cbuffer buffer { @@ -302,7 +302,7 @@ uniform 0 float 1.0 uniform 1 float 2.0 uniform 4 float4 5.0 6.0 7.0 8.0 draw quad -todo probe all rgba (512.0, 612.0, 712.0, 812.0) +probe all rgba (512.0, 612.0, 712.0, 812.0) [pixel shader fail todo] @@ -333,7 +333,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 draw quad -todo probe all rgba (3.0, 4.0, 3.0, 4.0) +probe all rgba (3.0, 4.0, 3.0, 4.0) [pixel shader fail]

1 0

Francisco Casas : vkd3d-shader/hlsl: Parse packoffset().
by Alexandre Julliard 04 Apr '23

04 Apr '23

Module: vkd3d Branch: master Commit: 4aca335f42b0db5c48500414cb006cd1967ab0be URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4aca335f42b0db5c48500414cb006… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Feb 22 14:53:17 2023 -0300 vkd3d-shader/hlsl: Parse packoffset(). --- libs/vkd3d-shader/hlsl.h | 12 ++++--- libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 90 ++++++++++++++++++++++++++++++++++++++++++++++- tests/cbuffer.shader_test | 50 ++++++++++++++++---------- 4 files changed, 129 insertions(+), 24 deletions(-)

1 0

← Newer
1
...
75
76
77
78
79
80
81
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2023