July 2022 - Wine-Commits - list.winehq.org

Ziqing Hui : d2d1/effect: Keep builtin effects in the same list as the custom once.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: 97abb6d2bad51d8c5d63ec1531519d5d642427a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97abb6d2bad51d8c5d63ec15… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 2 23:02:49 2022 +0300 d2d1/effect: Keep builtin effects in the same list as the custom once. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 6 ++++ dlls/d2d1/effect.c | 76 ++++++++++++++++++++---------------------------- dlls/d2d1/factory.c | 40 ++++++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 5 ++++ 4 files changed, 78 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97abb6d2bad51d8c5d63…

1 0

Nikolay Sivov : d2d1/tests: Use CRT allocation functions.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: 7918bfc5cd6d31d652f2b76602dc61b4febe3607 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7918bfc5cd6d31d652f2b766… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 13:59:47 2022 +0300 d2d1/tests: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 335659c24b3..1a964475168 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -28,7 +28,6 @@ #include "initguid.h" #include "dwrite.h" #include "wincodec.h" -#include "wine/heap.h" DEFINE_GUID(CLSID_TestEffect, 0xb9ee12e9,0x32d9,0xe659,0xac,0x61,0x2d,0x7c,0xea,0x69,0x28,0x78); DEFINE_GUID(GUID_TestVertexShader, 0x5bcdcfae,0x1e92,0x4dc1,0x94,0xfa,0x3b,0x01,0xca,0x54,0x59,0x20); @@ -358,7 +357,7 @@ static void queue_d3d1x_test(void (*test)(BOOL d3d11), BOOL d3d11) if (mt_test_count >= mt_tests_size) { mt_tests_size = max(16, mt_tests_size * 2); - mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + mt_tests = realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); } mt_tests[mt_test_count].test = test; mt_tests[mt_test_count++].d3d11 = d3d11; @@ -408,7 +407,7 @@ static void run_queued_tests(void) GetSystemInfo(&si); thread_count = si.dwNumberOfProcessors; - threads = heap_calloc(thread_count, sizeof(*threads)); + threads = calloc(thread_count, sizeof(*threads)); for (i = 0, test_idx = 0; i < thread_count; ++i) { threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); @@ -419,7 +418,7 @@ static void run_queued_tests(void) { CloseHandle(threads[i]); } - heap_free(threads); + free(threads); } static void set_point(D2D1_POINT_2F *point, float x, float y) @@ -10680,7 +10679,7 @@ static ULONG STDMETHODCALLTYPE effect_impl_Release(ID2D1EffectImpl *iface) { if (effect_impl->effect_context) ID2D1EffectContext_Release(effect_impl->effect_context); - heap_free(effect_impl); + free(effect_impl); } return refcount; @@ -10718,7 +10717,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_create(IUnknown **effect_impl) { struct effect_impl *object; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->ID2D1EffectImpl_iface.lpVtbl = &effect_impl_vtbl;

1 0

Paul Gofman : server: Allow IOCTL_AFD_POLL for sockets without unix fd.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: 07d3c823950ec0c5e9092a95fc1e74ccd00dd6a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07d3c823950ec0c5e9092a95… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 29 17:28:38 2022 -0500 server: Allow IOCTL_AFD_POLL for sockets without unix fd. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/tests/afd.c | 15 ++++++++++++--- server/sock.c | 5 +++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index fe3c2ef2ff6..f84e7084a27 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -172,15 +172,17 @@ static void test_poll(void) GUID acceptex_guid = WSAID_ACCEPTEX; SOCKET client, server, listener; OVERLAPPED overlapped = {0}; + HANDLE event, afd_handle; LPFN_ACCEPTEX pAcceptEx; struct sockaddr_in addr; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; DWORD size, flags = 0; char *large_buffer; IO_STATUS_BLOCK io; LARGE_INTEGER now; ULONG params_size; WSABUF wsabuf; - HANDLE event; int ret, len; large_buffer = malloc(large_buffer_size); @@ -189,6 +191,11 @@ static void test_poll(void) event = CreateEventW(NULL, TRUE, FALSE, NULL); overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + RtlInitUnicodeString(&string, L"\\Device\\Afd\\deadbeef"); + InitializeObjectAttributes(&attr, &string, 0, NULL, NULL); + ret = NtOpenFile(&afd_handle, SYNCHRONIZE, &attr, &io, 0, 0); + ok(!ret, "got %#x\n", ret); + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ret = bind(listener, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); ok(!ret, "got error %u\n", WSAGetLastError()); @@ -246,7 +253,7 @@ static void test_poll(void) in_params->sockets[0].status = 0xdeadbeef; memset(out_params, 0, params_size); - ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, + ret = NtDeviceIoControlFile(afd_handle, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); ok(!ret, "got %#x\n", ret); ok(!io.Status, "got %#lx\n", io.Status); @@ -260,7 +267,7 @@ static void test_poll(void) NtQuerySystemTime(&now); in_params->timeout = now.QuadPart; - ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, + ret = NtDeviceIoControlFile(afd_handle, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 100); @@ -899,6 +906,8 @@ static void test_poll(void) CloseHandle(overlapped.hEvent); CloseHandle(event); free(large_buffer); + + CloseHandle(afd_handle); } struct poll_exclusive_thread_cb_ctx diff --git a/server/sock.c b/server/sock.c index 2f1b33a333d..caa68dd213b 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2186,11 +2186,12 @@ static struct accept_req *alloc_accept_req( struct sock *sock, struct sock *acce static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct sock *sock = get_fd_user( fd ); - int unix_fd; + int unix_fd = -1; assert( sock->obj.ops == &sock_ops ); - if (code != IOCTL_AFD_WINE_CREATE && (unix_fd = get_unix_fd( fd )) < 0) return; + if (code != IOCTL_AFD_WINE_CREATE && code != IOCTL_AFD_POLL && (unix_fd = get_unix_fd( fd )) < 0) + return; switch(code) {

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 logic or instructions.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: vkd3d Branch: master Commit: 448f856c0982b00a4c49a87ca952f9f4427f2c43 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=448f856c0982b00a4c49a87… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jul 1 11:23:33 2022 +0200 vkd3d-shader/hlsl: Write SM4 logic or instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ tests/logic-operations.shader_test | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 0829c5e9..d2857e6a 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1851,6 +1851,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_AND, &expr->node, arg1, arg2); break; + case HLSL_OP2_LOGIC_OR: + assert(dst_type->base_type == HLSL_TYPE_BOOL); + write_sm4_binary_op(buffer, VKD3D_SM4_OP_OR, &expr->node, arg1, arg2); + break; + case HLSL_OP2_LSHIFT: assert(type_is_integer(dst_type)); assert(dst_type->base_type != HLSL_TYPE_BOOL); diff --git a/tests/logic-operations.shader_test b/tests/logic-operations.shader_test index 032b5b23..360ca03b 100644 --- a/tests/logic-operations.shader_test +++ b/tests/logic-operations.shader_test @@ -48,7 +48,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -101,7 +101,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -154,5 +154,5 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 casts from bool.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: vkd3d Branch: master Commit: 3e88a46d4cdde708f6eddcb502889a704ba1882b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3e88a46d4cdde708f6eddcb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jul 1 11:23:30 2022 +0200 vkd3d-shader/hlsl: Write SM4 casts from bool. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 33 ++++++++++++++++++++++++++++++--- tests/cast-to-float.shader_test | 2 +- tests/cast-to-int.shader_test | 4 ++-- tests/cast-to-uint.shader_test | 4 ++-- tests/hlsl-bool-cast.shader_test | 18 ++++++++++++++++++ tests/logic-operations.shader_test | 6 +++--- 6 files changed, 56 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 79027169..1edc5818 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1459,9 +1459,36 @@ static bool type_is_float(const struct hlsl_type *type) return type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF; } +static void write_sm4_cast_from_bool(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr, + const struct hlsl_ir_node *arg, uint32_t mask) +{ + struct sm4_instruction instr; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_AND; + + sm4_dst_from_node(&instr.dsts[0], &expr->node); + instr.dst_count = 1; + + sm4_src_from_node(&instr.srcs[0], arg, instr.dsts[0].writemask); + instr.srcs[1].swizzle_type = VKD3D_SM4_SWIZZLE_NONE; + instr.srcs[1].reg.type = VKD3D_SM4_RT_IMMCONST; + instr.srcs[1].reg.dim = VKD3D_SM4_DIMENSION_SCALAR; + instr.srcs[1].reg.immconst_uint[0] = mask; + instr.src_count = 2; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr) { + static const union + { + uint32_t u; + float f; + } one = { .f = 1.0 }; const struct hlsl_ir_node *arg1 = expr->operands[0].node; const struct hlsl_type *dst_type = expr->node.data_type; const struct hlsl_type *src_type = arg1->data_type; @@ -1488,7 +1515,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to float."); + write_sm4_cast_from_bool(ctx, buffer, expr, arg1, one.u); break; case HLSL_TYPE_DOUBLE: @@ -1514,7 +1541,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to int."); + write_sm4_cast_from_bool(ctx, buffer, expr, arg1, 1); break; case HLSL_TYPE_DOUBLE: @@ -1540,7 +1567,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to uint."); + write_sm4_cast_from_bool(ctx, buffer, expr, arg1, 1); break; case HLSL_TYPE_DOUBLE: diff --git a/tests/cast-to-float.shader_test b/tests/cast-to-float.shader_test index 1844b1f3..f0910020 100644 --- a/tests/cast-to-float.shader_test +++ b/tests/cast-to-float.shader_test @@ -12,7 +12,7 @@ uniform 0 int -1 uniform 1 uint 3 uniform 2 int -2 uniform 3 float 0.5 -todo draw quad +draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/cast-to-int.shader_test b/tests/cast-to-int.shader_test index ce42827b..4c5d0e2f 100644 --- a/tests/cast-to-int.shader_test +++ b/tests/cast-to-int.shader_test @@ -19,8 +19,8 @@ uniform 0 float 2.6 uniform 1 int -2 uniform 2 int -2 uniform 3 float -3.6 -todo draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +draw quad +todo probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/cast-to-uint.shader_test b/tests/cast-to-uint.shader_test index 8b7964ff..66f7267e 100644 --- a/tests/cast-to-uint.shader_test +++ b/tests/cast-to-uint.shader_test @@ -19,8 +19,8 @@ uniform 0 float 2.6 uniform 1 int 2 uniform 2 int -2 uniform 3 float -3.6 -todo draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +draw quad +todo probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/hlsl-bool-cast.shader_test b/tests/hlsl-bool-cast.shader_test index 8880b2f5..397cbcc0 100644 --- a/tests/hlsl-bool-cast.shader_test +++ b/tests/hlsl-bool-cast.shader_test @@ -12,3 +12,21 @@ float4 main() : SV_TARGET [test] draw quad probe all rgba (0.0, 0.0, 1.0, 1.0) + +[require] +shader model >= 4.0 + +[pixel shader] +uniform float4 x; +uniform int4 y; + +float4 main() : SV_TARGET +{ + return (float4)(bool4)x + 10.0 * (float4)(int4)(bool4)y; +} + +[test] +uniform 0 float4 0.0 0.0 2.0 4.0 +uniform 4 int4 0 1 0 10 +draw quad +probe all rgba (0.0, 10.0, 1.0, 11.0) diff --git a/tests/logic-operations.shader_test b/tests/logic-operations.shader_test index 9a5cec3f..f888e831 100644 --- a/tests/logic-operations.shader_test +++ b/tests/logic-operations.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -61,7 +61,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -114,7 +114,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader]

1 0

Giovanni Mascellani : tests: Test arithmetic int operations without constant operands.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: vkd3d Branch: master Commit: 2ec6d4d3ffe453fc20bf05d2049a7ea28c767323 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2ec6d4d3ffe453fc20bf05d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jul 1 11:23:34 2022 +0200 tests: Test arithmetic int operations without constant operands. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/arithmetic-int-uniform.shader_test | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0cb90b2b..60db7794 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,7 @@ vkd3d_shader_tests = \ tests/abs.shader_test \ tests/arithmetic-float.shader_test \ tests/arithmetic-int.shader_test \ + tests/arithmetic-int-uniform.shader_test \ tests/arithmetic-uint.shader_test \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test new file mode 100644 index 00000000..ff80a9b0 --- /dev/null +++ b/tests/arithmetic-int-uniform.shader_test @@ -0,0 +1,29 @@ +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + int x = a.x; + int y = a.y; + return float4(x + y, x - y, x * y, x / y); +} + +[test] +uniform 0 float4 5.0 16.0 0.0 0.0 +todo draw quad +probe all rgba (21.0, -11.0, 80.0, 0.0) + +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + int x = a.x; + int y = a.y; + return float4(x % y, +x, -x, y / x); +} + +[test] +uniform 0 float4 5.0 16.0 0.0 0.0 +todo draw quad +probe all rgba (5.0, 5.0, -5.0, 3.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 logic not instructions.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: vkd3d Branch: master Commit: 02d92c9af676d819f6c1a0bc59635c5fabf7a46b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=02d92c9af676d819f6c1a0b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jul 1 11:23:31 2022 +0200 vkd3d-shader/hlsl: Write SM4 logic not instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ tests/logic-operations.shader_test | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 1edc5818..08f9d12c 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1648,6 +1648,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM4_OP_LOG, &expr->node, arg1, 0); break; + case HLSL_OP1_LOGIC_NOT: + assert(dst_type->base_type == HLSL_TYPE_BOOL); + write_sm4_unary_op(buffer, VKD3D_SM4_OP_NOT, &expr->node, arg1, 0); + break; + case HLSL_OP1_NEG: switch (dst_type->base_type) { diff --git a/tests/logic-operations.shader_test b/tests/logic-operations.shader_test index f888e831..87e927f4 100644 --- a/tests/logic-operations.shader_test +++ b/tests/logic-operations.shader_test @@ -22,7 +22,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -75,7 +75,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -128,7 +128,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 1.0) [pixel shader]

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 logic and instructions.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: vkd3d Branch: master Commit: 15e4b9bafb74e45db2fdd2dbf8eabcb9ef949cf0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=15e4b9bafb74e45db2fdd2d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jul 1 11:23:32 2022 +0200 vkd3d-shader/hlsl: Write SM4 logic and instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ tests/logic-operations.shader_test | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 08f9d12c..0829c5e9 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1846,6 +1846,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP2_LOGIC_AND: + assert(dst_type->base_type == HLSL_TYPE_BOOL); + write_sm4_binary_op(buffer, VKD3D_SM4_OP_AND, &expr->node, arg1, arg2); + break; + case HLSL_OP2_LSHIFT: assert(type_is_integer(dst_type)); assert(dst_type->base_type != HLSL_TYPE_BOOL); diff --git a/tests/logic-operations.shader_test b/tests/logic-operations.shader_test index 87e927f4..032b5b23 100644 --- a/tests/logic-operations.shader_test +++ b/tests/logic-operations.shader_test @@ -35,7 +35,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -88,7 +88,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -141,7 +141,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 1.0) [pixel shader]

1 0

Francois Gouget : testbot/UpdateFailures: Tweak the save error message.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: tools Branch: master Commit: bbb85bacf5aa11cb60c602c1fa9a3787dc22a363 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bbb85bacf5aa11cb60c602c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 5 17:51:26 2022 +0200 testbot/UpdateFailures: Tweak the save error message. The error message already contains the name of the invalid field(s). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateFailures.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/UpdateFailures.pl b/testbot/bin/UpdateFailures.pl index f324cca2..b1c8e071 100755 --- a/testbot/bin/UpdateFailures.pl +++ b/testbot/bin/UpdateFailures.pl @@ -193,10 +193,10 @@ foreach my $FailureId (@FailureIds) } } -my ($ErrKey, $ErrProperty, $ErrMessage) = $Failures->Save(); +my ($ErrKey, $_ErrProperty, $ErrMessage) = $Failures->Save(); if ($ErrMessage) { - Error("Could not save $ErrKey because of the $ErrProperty field: $ErrMessage\n"); + Error("Could not save failure $ErrKey: $ErrMessage\n"); exit 1; }

1 0

Francois Gouget : testbot/cgi: Improve the error handling API.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: tools Branch: master Commit: e788323fbb0c99f266a615703f748aafee9fc6d9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e788323fbb0c99f266a6157… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 5 17:51:39 2022 +0200 testbot/cgi: Improve the error handling API. Add IsErrField() and ResetErrors() so web pages don't need to access the error fields directly. Add AddError() where the name of the error field is optional since it is often undetermined. Document the API, particularly with regards to the content of the error message and whether all errors have an associated error field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 90 +++++++++++++++++++++++++++++++++---- 1 file changed, 82 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 1b9630cc..6e18c29a 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -89,8 +89,9 @@ sub new($$$@) my $self = {Request => $Request, CGIObj => CGI->new($Request), - ErrMessage => undef, - ErrField => undef}; + # ErrMessage => undef by default + # ErrField => undef by default + }; $self = bless $self, $class; $self->{PageBase} = &$PageBaseCreator($self, @_); $self->_initialize(@_); @@ -293,26 +294,99 @@ sub Redirect($$) # Error handling framework # -sub GetErrField($) +=pod +=over 12 + +=head1 C<GetErrMessage()> + +Returns the error message if any, undef otherwise. + +=back +=cut + +sub GetErrMessage($) { my ($self) = @_; + return $self->{ErrMessage}; +} + +=pod +=over 12 +=head1 C<GetErrField()> + +Returns the name of the invalid field, undef otherwise. + +Note that if the error does not concern a specific field this may return +undef even though an error has been set. + +=back +=cut + +sub GetErrField($) +{ + my ($self) = @_; return $self->{ErrField}; } -sub GetErrMessage($) +=pod +=over 12 + +=head1 C<IsErrField()> + +Returns true if the error concerns the specified field. + +=back +=cut + +sub IsErrField($$) { - my ($self) = @_; + my ($self, $FieldName) = @_; + return defined $self->{ErrField} and $self->{ErrField} eq $FieldName; +} - return $self->{ErrMessage}; +=pod +=over 12 + +=head1 C<AddError()> + +Sets the error message to be shown to the user. +=over + +=item ErrMessage +A message to be shown on the page that describes why the form data is invalid. +This should include the display name of the field(s) that need to be fixed. + +=item ErrField +If the error concerns a specific field, the name of that field. This can be +used by the page to highlight the field that needs to be corrected. + +=back + +=back +=cut + +sub AddError($$;$) +{ + my ($self, $ErrMessage, $ErrField) = @_; + + $self->{ErrMessage} = $ErrMessage; + $self->{ErrField} = $ErrField; } +# FIXME: For legacy code, to be removed. sub SetError($$$) { my ($self, $ErrField, $ErrMessage) = @_; + $self->AddError($ErrMessage, $ErrField); +} - $self->{ErrField} = $ErrField; - $self->{ErrMessage} = $ErrMessage; +sub ResetErrors($) +{ + my ($self) = @_; + + delete $self->{ErrMessage}; + delete $self->{ErrField}; } sub GenerateErrorDiv($)

1 0