April 2023 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Use the trunc()/truncf() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 09006678768ab92694521a1b6ee461ea9c85ed71 URL: https://gitlab.winehq.org/wine/wine/-/commit/09006678768ab92694521a1b6ee461… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 15:35:27 2023 +0200 msvcrt: Use the trunc()/truncf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9b5f628fbec..1e1bece23f1 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -8482,50 +8482,6 @@ __int64 CDECL llroundf(float x) return f; } -/********************************************************************* - * trunc (MSVCR120.@) - * - * Copied from musl: src/math/trunc.c - */ -double CDECL trunc(double x) -{ - union {double f; UINT64 i;} u = {x}; - int e = (u.i >> 52 & 0x7ff) - 0x3ff + 12; - UINT64 m; - - if (e >= 52 + 12) - return x; - if (e < 12) - e = 1; - m = -1ULL >> e; - if ((u.i & m) == 0) - return x; - u.i &= ~m; - return u.f; -} - -/********************************************************************* - * truncf (MSVCR120.@) - * - * Copied from musl: src/math/truncf.c - */ -float CDECL truncf(float x) -{ - union {float f; UINT32 i;} u = {x}; - int e = (u.i >> 23 & 0xff) - 0x7f + 9; - UINT32 m; - - if (e >= 23 + 9) - return x; - if (e < 9) - e = 1; - m = -1U >> e; - if ((u.i & m) == 0) - return x; - u.i &= ~m; - return u.f; -} - /********************************************************************* * _dtest (MSVCR120.@) */

1 0

Alexandre Julliard : msvcrt: Use the modf()/modff() implementation from the bundled musl library.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: e5808e203628416bd884720b3c91fc9d73706fe8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5808e203628416bd884720b3c91fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 15:30:58 2023 +0200 msvcrt: Use the modf()/modff() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 76 ------------------------------------------------------ 1 file changed, 76 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f32e85a26a8..4d8e0e17b6f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2009,44 +2009,6 @@ float CDECL floorf( float x ) return u.f; } -/********************************************************************* - * modff (MSVCRT.@) - * - * Copied from musl: src/math/modff.c - */ -float CDECL modff( float x, float *iptr ) -{ - union {float f; UINT32 i;} u = {x}; - UINT32 mask; - int e = (u.i >> 23 & 0xff) - 0x7f; - - /* no fractional part */ - if (e >= 23) { - *iptr = x; - if (e == 0x80 && u.i << 9 != 0) { /* nan */ - return x; - } - u.i &= 0x80000000; - return u.f; - } - /* no integral part */ - if (e < 0) { - u.i &= 0x80000000; - *iptr = u.f; - return x; - } - - mask = 0x007fffff >> e; - if ((u.i & mask) == 0) { - *iptr = x; - u.i &= 0x80000000; - return u.f; - } - u.i &= ~mask; - *iptr = u.f; - return x - u.f; -} - #endif /********************************************************************* @@ -5053,44 +5015,6 @@ float CDECL fmaf( float x, float y, float z ) return u.f; } -/********************************************************************* - * modf (MSVCRT.@) - * - * Copied from musl: src/math/modf.c - */ -double CDECL modf( double x, double *iptr ) -{ - union {double f; UINT64 i;} u = {x}; - UINT64 mask; - int e = (u.i >> 52 & 0x7ff) - 0x3ff; - - /* no fractional part */ - if (e >= 52) { - *iptr = x; - if (e == 0x400 && u.i << 12 != 0) /* nan */ - return x; - u.i &= 1ULL << 63; - return u.f; - } - - /* no integral part*/ - if (e < 0) { - u.i &= 1ULL << 63; - *iptr = u.f; - return x; - } - - mask = -1ULL >> 12 >> e; - if ((u.i & mask) == 0) { - *iptr = x; - u.i &= 1ULL << 63; - return u.f; - } - u.i &= ~mask; - *iptr = u.f; - return x - u.f; -} - #if defined(__i386__) || defined(__x86_64__) static void _setfp_sse( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask )

1 0

Paul Gofman : winegstreamer: Fix check for non-zero padding in h264 transform.
by Alexandre Julliard April 4, 2023

April 4, 2023

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 April 4, 2023

April 4, 2023

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 : vkd3d-shader/hlsl: Ignore packoffset() contents for SM1.
by Alexandre Julliard April 4, 2023

April 4, 2023

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 : tests: Test packoffset() with resources inside cbuffers.
by Alexandre Julliard April 4, 2023

April 4, 2023

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: Rename struct hlsl_reg_reservation fields.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: vkd3d Branch: master Commit: 9b7097169644af25d000bfbc3282253524d328fa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9b7097169644af25d000bfbc32822… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Mar 6 19:53:29 2023 -0300 vkd3d-shader/hlsl: Rename struct hlsl_reg_reservation fields. --- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl.y | 10 +++++----- libs/vkd3d-shader/hlsl_codegen.c | 25 +++++++++++++------------ libs/vkd3d-shader/hlsl_sm4.c | 4 ++-- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c8e267d2..e7061dbe 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -346,8 +346,8 @@ struct hlsl_attribute * using the register(·) syntax */ struct hlsl_reg_reservation { - char type; - unsigned int index; + char reg_type; + unsigned int reg_index; }; struct hlsl_ir_var diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index afcc4575..da82cb37 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1084,12 +1084,12 @@ static struct hlsl_reg_reservation parse_reg_reservation(const char *reg_string) { struct hlsl_reg_reservation reservation = {0}; - if (!sscanf(reg_string + 1, "%u", &reservation.index)) + if (!sscanf(reg_string + 1, "%u", &reservation.reg_index)) { FIXME("Unsupported register reservation syntax.\n"); return reservation; } - reservation.type = reg_string[0]; + reservation.reg_type = reg_string[0]; return reservation; } @@ -4349,7 +4349,7 @@ func_prototype_no_attrs: "Semantics are not allowed on void functions."); } - if ($7.reg_reservation.type) + if ($7.reg_reservation.reg_type) FIXME("Unexpected register reservation for a function.\n"); if (($$.decl = get_func_decl(&ctx->functions, $3, &$5))) @@ -4477,12 +4477,12 @@ colon_attribute: %empty { $$.semantic.name = NULL; - $$.reg_reservation.type = 0; + $$.reg_reservation.reg_type = 0; } | semantic { $$.semantic = $1; - $$.reg_reservation.type = 0; + $$.reg_reservation.reg_type = 0; } | register_opt { diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6c529f19..411aa79f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2307,9 +2307,9 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx) continue; regset = hlsl_type_get_regset(var->data_type); - if (var->reg_reservation.type) + if (var->reg_reservation.reg_type) { - if (var->reg_reservation.type != get_regset_name(regset)) + if (var->reg_reservation.reg_type != get_regset_name(regset)) { struct vkd3d_string_buffer *type_string; @@ -2322,8 +2322,9 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx) else { var->regs[regset].allocated = true; - var->regs[regset].id = var->reg_reservation.index; - TRACE("Allocated reserved %s to %c%u.\n", var->name, var->reg_reservation.type, var->reg_reservation.index); + var->regs[regset].id = var->reg_reservation.reg_index; + TRACE("Allocated reserved %s to %c%u.\n", var->name, var->reg_reservation.reg_type, + var->reg_reservation.reg_index); } } } @@ -2898,7 +2899,7 @@ static const struct hlsl_buffer *get_reserved_buffer(struct hlsl_ctx *ctx, uint3 LIST_FOR_EACH_ENTRY(buffer, &ctx->buffers, const struct hlsl_buffer, entry) { - if (buffer->used_size && buffer->reservation.type == 'b' && buffer->reservation.index == index) + if (buffer->used_size && buffer->reservation.reg_type == 'b' && buffer->reservation.reg_index == index) return buffer; } return NULL; @@ -2941,23 +2942,23 @@ static void allocate_buffers(struct hlsl_ctx *ctx) if (buffer->type == HLSL_BUFFER_CONSTANT) { - if (buffer->reservation.type == 'b') + if (buffer->reservation.reg_type == 'b') { - const struct hlsl_buffer *reserved_buffer = get_reserved_buffer(ctx, buffer->reservation.index); + const struct hlsl_buffer *reserved_buffer = get_reserved_buffer(ctx, buffer->reservation.reg_index); if (reserved_buffer && reserved_buffer != buffer) { hlsl_error(ctx, &buffer->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, - "Multiple buffers bound to cb%u.", buffer->reservation.index); + "Multiple buffers bound to cb%u.", buffer->reservation.reg_index); hlsl_note(ctx, &reserved_buffer->loc, VKD3D_SHADER_LOG_ERROR, - "Buffer %s is already bound to cb%u.", reserved_buffer->name, buffer->reservation.index); + "Buffer %s is already bound to cb%u.", reserved_buffer->name, buffer->reservation.reg_index); } - buffer->reg.id = buffer->reservation.index; + buffer->reg.id = buffer->reservation.reg_index; buffer->reg.allocated = true; TRACE("Allocated reserved %s to cb%u.\n", buffer->name, index); } - else if (!buffer->reservation.type) + else if (!buffer->reservation.reg_type) { while (get_reserved_buffer(ctx, index)) ++index; @@ -3043,7 +3044,7 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_regset regset) regset_name, index); } - var->regs[regset].id = var->reg_reservation.index; + var->regs[regset].id = var->reg_reservation.reg_index; var->regs[regset].allocated = true; TRACE("Allocated reserved %s to %c%u.\n", var->name, regset_name, var->regs[regset].id); } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 3fc44d9c..6dd76d67 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -594,7 +594,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) var = extern_resources[i]; regset = hlsl_type_get_regset(var->data_type); - if (var->reg_reservation.type) + if (var->reg_reservation.reg_type) flags |= D3D_SIF_USERPACKED; put_u32(&buffer, 0); /* name */ @@ -624,7 +624,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) if (!cbuffer->reg.allocated) continue; - if (cbuffer->reservation.type) + if (cbuffer->reservation.reg_type) flags |= D3D_SIF_USERPACKED; put_u32(&buffer, 0); /* name */

1 0

Francisco Casas : vkd3d-shader/hlsl: Support packoffset().
by Alexandre Julliard April 4, 2023

April 4, 2023

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 April 4, 2023

April 4, 2023

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

Francisco Casas : vkd3d-shader/hlsl: Don't allow manual and automatic cbuffer offset packing.
by Alexandre Julliard April 4, 2023

April 4, 2023

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