wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Zebediah Figura : user32: Do not use SetDIBits() in create_masked_bitmap().
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: wine Branch: master Commit: 197f2ee6c0e2dd70cfac6e15ede7fc0e38948188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=197f2ee6c0e2dd70cfac6e15… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 15 16:49:16 2021 -0600 user32: Do not use SetDIBits() in create_masked_bitmap(). The given bitmap is in DDB format, not DIB format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51296 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 31 +++++++++++++++------------- dlls/user32/tests/cursoricon.c | 47 +++++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 31 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 827db302a30..828c88de92f 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1753,22 +1753,25 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, static HBITMAP create_masked_bitmap( int width, int height, const void *and, const void *xor ) { - HDC dc = CreateCompatibleDC( 0 ); - HBITMAP bitmap; - - const BITMAPINFO bitmap_info = - { - .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), - .bmiHeader.biWidth = width, - .bmiHeader.biHeight = height * 2, - .bmiHeader.biPlanes = 1, - .bmiHeader.biBitCount = 1, - }; + HBITMAP and_bitmap, xor_bitmap, bitmap; + HDC src_dc, dst_dc; + and_bitmap = CreateBitmap( width, height, 1, 1, and ); + xor_bitmap = CreateBitmap( width, height, 1, 1, xor ); bitmap = CreateBitmap( width, height * 2, 1, 1, NULL ); - SetDIBits( dc, bitmap, 0, height, and, &bitmap_info, FALSE ); - SetDIBits( dc, bitmap, height, height, xor, &bitmap_info, FALSE ); - DeleteDC( dc ); + src_dc = CreateCompatibleDC( 0 ); + dst_dc = CreateCompatibleDC( 0 ); + + SelectObject( dst_dc, bitmap ); + SelectObject( src_dc, and_bitmap ); + BitBlt( dst_dc, 0, 0, width, height, src_dc, 0, 0, SRCCOPY ); + SelectObject( src_dc, xor_bitmap ); + BitBlt( dst_dc, 0, height, width, height, src_dc, 0, 0, SRCCOPY ); + + DeleteObject( and_bitmap ); + DeleteObject( xor_bitmap ); + DeleteDC( src_dc ); + DeleteDC( dst_dc ); return bitmap; } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 1bbe2591d59..3e8d7c1707f 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -769,8 +769,9 @@ static void test_initial_cursor(void) } static void test_icon_info_(HICON hIcon, UINT exp_cx, UINT exp_cy, - UINT exp_mask_cy, UINT exp_bpp, UINT has_color, int line) + UINT exp_mask_cy, UINT exp_bpp, const BYTE *mask_bits, UINT has_color, int line) { + BYTE ret_bits[1024]; ICONINFO info; DWORD ret; BITMAP bmMask, bmColor; @@ -783,6 +784,15 @@ static void test_icon_info_(HICON hIcon, UINT exp_cx, UINT exp_cy, ok_(__FILE__, line)(info.yHotspot == exp_cy/2, "info.yHotspot = %u\n", info.yHotspot); ok_(__FILE__, line)(info.hbmMask != 0, "info.hbmMask is NULL\n"); + if (mask_bits) + { + unsigned int exp_stride = (exp_cx + 7) / 8; + exp_stride = (exp_stride + 1) & ~1; + ret = GetBitmapBits(info.hbmMask, sizeof(ret_bits), ret_bits); + ok_(__FILE__, line)(ret == exp_stride * exp_mask_cy, "GetBitmapBits returned %u\n", ret); + ok_(__FILE__, line)(!memcmp(ret_bits, mask_bits, ret), "mask bitmap didn't match\n"); + } + ret = GetObjectA(info.hbmMask, sizeof(bmMask), &bmMask); ok_(__FILE__, line)(ret == sizeof(bmMask), "GetObject(info.hbmMask) failed, ret %u\n", ret); @@ -849,11 +859,11 @@ static void test_icon_info_(HICON hIcon, UINT exp_cx, UINT exp_cy, } } -#define test_icon_info(a,b,c,d,e,f) test_icon_info_(a,b,c,d,e,f,__LINE__) +#define test_icon_info(a,b,c,d,e,f,g) test_icon_info_(a,b,c,d,e,f,g,__LINE__) static void test_CreateIcon(void) { - static const BYTE bmp_bits[1024]; + BYTE bmp_bits[1024]; HICON hIcon; HBITMAP hbmMask, hbmColor; BITMAPINFO *bmpinfo; @@ -863,6 +873,9 @@ static void test_CreateIcon(void) UINT display_bpp; int i; + for (i = 0; i < sizeof(bmp_bits); ++i) + bmp_bits[i] = 111 * i; + hdc = GetDC(0); display_bpp = GetDeviceCaps(hdc, BITSPIXEL); @@ -871,19 +884,19 @@ static void test_CreateIcon(void) hIcon = CreateIcon(0, 16, 16, 1, 1, NULL, bmp_bits); */ - hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, bmp_bits); + hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, &bmp_bits[16 * 16 / 8]); ok(hIcon != 0, "CreateIcon failed\n"); - test_icon_info(hIcon, 16, 16, 32, 1, FALSE); + test_icon_info(hIcon, 16, 16, 32, 1, bmp_bits, FALSE); DestroyIcon(hIcon); - hIcon = CreateCursor(0, 8, 8, 16, 16, bmp_bits, bmp_bits); + hIcon = CreateCursor(0, 8, 8, 16, 16, bmp_bits, &bmp_bits[16 * 16 / 8]); ok(hIcon != 0, "CreateCursor failed\n"); - test_icon_info(hIcon, 16, 16, 32, 1, FALSE); + test_icon_info(hIcon, 16, 16, 32, 1, bmp_bits, FALSE); DestroyCursor(hIcon); hIcon = CreateIcon(0, 16, 16, 1, display_bpp, bmp_bits, bmp_bits); ok(hIcon != 0, "CreateIcon failed\n"); - test_icon_info(hIcon, 16, 16, 16, display_bpp, TRUE); + test_icon_info(hIcon, 16, 16, 16, display_bpp, bmp_bits, TRUE); DestroyIcon(hIcon); hbmMask = CreateBitmap(16, 16, 1, 1, bmp_bits); @@ -918,7 +931,7 @@ static void test_CreateIcon(void) info.hbmColor = hbmColor; hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 16, 16, display_bpp, TRUE); + test_icon_info(hIcon, 16, 16, 16, display_bpp, bmp_bits, TRUE); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -935,7 +948,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 16, 32, 1, FALSE); + test_icon_info(hIcon, 16, 16, 32, 1, bmp_bits, FALSE); DestroyIcon(hIcon); info.hbmMask = hbmMask; @@ -943,7 +956,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 32, 32, 1, TRUE); + test_icon_info(hIcon, 16, 32, 32, 1, bmp_bits, TRUE); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -961,7 +974,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 1, i / 2, max(i,1), 1, FALSE); + test_icon_info(hIcon, 1, i / 2, max(i,1), 1, NULL, FALSE); DestroyIcon(hIcon); DeleteObject(hbmMask); } @@ -974,7 +987,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 16, 32, 1, FALSE); + test_icon_info(hIcon, 16, 16, 32, 1, NULL, FALSE); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -1006,7 +1019,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 32, 32, 32, 8, TRUE); + test_icon_info(hIcon, 32, 32, 32, 8, NULL, TRUE); DestroyIcon(hIcon); DeleteObject(hbmColor); @@ -1024,7 +1037,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 32, 32, 32, 8, TRUE); + test_icon_info(hIcon, 32, 32, 32, 8, NULL, TRUE); DestroyIcon(hIcon); DeleteObject(hbmColor); @@ -1042,7 +1055,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 32, 32, 32, 8, TRUE); + test_icon_info(hIcon, 32, 32, 32, 8, NULL, TRUE); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -2812,7 +2825,7 @@ static void test_PrivateExtractIcons(void) ok(ret == 1, "PrivateExtractIconsA returned %u\n", ret); ok(icon != NULL, "icon == NULL\n"); - test_icon_info(icon, 32, 32, 32, 32, TRUE); + test_icon_info(icon, 32, 32, 32, 32, NULL, TRUE); DestroyIcon(icon); DeleteFileA("extract.ico");

1 0

Andrey Gusev : vkd3d-shader: Remove duplicate initialization.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: c7682480dd40f22a8fa03e2fa593d48000c01c49 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c7682480dd40f22a8fa03e2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Dec 15 21:29:28 2021 +0200 vkd3d-shader: Remove duplicate initialization. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/d3dbc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 267f960..c551875 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -878,8 +878,6 @@ static enum vkd3d_result shader_sm1_init(struct vkd3d_shader_sm1_parser *sm1, uint16_t shader_type; size_t token_count; - code = compile_info->source.code; - code_size = compile_info->source.size; token_count = code_size / sizeof(*sm1->start); if (token_count < 2)

1 0

Conor McCarthy : vkd3d: Don't copy an entire descriptor when destroying a view.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: b252693043b848f82d732b6c08f16ea1e6ffd488 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b252693043b848f82d732b6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Dec 9 01:00:22 2021 +1000 vkd3d: Don't copy an entire descriptor when destroying a view. Based on a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1991223..fb5346e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2121,26 +2121,24 @@ void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device) { - struct d3d12_desc destroy_desc; + struct vkd3d_view *defunct_view = NULL; pthread_mutex_t *mutex; - destroy_desc.u.view = NULL; - mutex = d3d12_device_get_descriptor_mutex(device, dst); pthread_mutex_lock(mutex); /* Nothing to do for VKD3D_DESCRIPTOR_MAGIC_CBV. */ if ((dst->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) && !InterlockedDecrement(&dst->u.view->refcount)) - destroy_desc = *dst; + defunct_view = dst->u.view; *dst = *src; pthread_mutex_unlock(mutex); /* Destroy the view after unlocking to reduce wait time. */ - if (destroy_desc.u.view) - vkd3d_view_destroy(destroy_desc.u.view, device); + if (defunct_view) + vkd3d_view_destroy(defunct_view, device); } static void d3d12_desc_destroy(struct d3d12_desc *descriptor, struct d3d12_device *device)

1 0

Matteo Bruni : vkd3d-shader/hlsl: Explicitly set swizzle type for resource derefs.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 726bf72b079b25dbfb5ab882d5230164f76e4fe4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=726bf72b079b25dbfb5ab88… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Dec 1 17:15:06 2021 +0100 vkd3d-shader/hlsl: Explicitly set swizzle type for resource derefs. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 5be8328..2458018 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -772,6 +772,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r { reg->type = VKD3D_SM4_RT_RESOURCE; reg->dim = VKD3D_SM4_DIMENSION_VEC4; + if (swizzle_type) + *swizzle_type = VKD3D_SM4_SWIZZLE_VEC4; reg->idx[0] = var->reg.id; reg->idx_count = 1; *writemask = VKD3DSP_WRITEMASK_ALL;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 unsigned minimum.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 56bd7fc8b381982b800adc10233c4ee98162a5c0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=56bd7fc8b381982b800adc1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 1 17:15:05 2021 +0100 vkd3d-shader/hlsl: Write SM4 unsigned minimum. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 0d6e8c1..5be8328 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1476,6 +1476,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_UMAX, &expr->node, arg1, arg2); break; + case HLSL_OP2_MIN: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_UMIN, &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 uint \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 unsigned maximum.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 3fd1d5c33ed1a6d7bf373d8b4c73e34d020c4369 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3fd1d5c33ed1a6d7bf373d8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 1 17:15:04 2021 +0100 vkd3d-shader/hlsl: Write SM4 unsigned maximum. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a17ca59..0d6e8c1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1472,6 +1472,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP2_MAX: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_UMAX, &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 uint \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 integer minimum.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 790f330836874a6ab9c469905346fa7d38e7badf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=790f330836874a6ab9c4699… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 1 17:15:03 2021 +0100 vkd3d-shader/hlsl: Write SM4 integer minimum. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 05b0dc1..a17ca59 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1424,6 +1424,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_IMAX, &expr->node, arg1, arg2); break; + case HLSL_OP2_MIN: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_IMIN, &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 int \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 integer maximum.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: ccc2dcee1b5029b888aa82a6d6c771fba307348b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ccc2dcee1b5029b888aa82a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 1 17:15:02 2021 +0100 vkd3d-shader/hlsl: Write SM4 integer maximum. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 7f2f960..05b0dc1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1420,6 +1420,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM4_OP_INEG, &expr->node, arg1, 0); break; + case HLSL_OP2_MAX: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_IMAX, &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 int \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse min intrinsic.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 4441dafa0934b6a2a1d179f7f380cd7c1162fb9c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4441dafa0934b6a2a1d179f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 1 17:15:01 2021 +0100 vkd3d-shader/hlsl: Parse min intrinsic. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(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.y | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 131af39..636882c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1647,6 +1647,12 @@ static bool intrinsic_max(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MAX, params->args[0], params->args[1], loc); } +static bool intrinsic_min(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MIN, params->args[0], params->args[1], loc); +} + static bool intrinsic_pow(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -1693,6 +1699,7 @@ intrinsic_functions[] = {"clamp", 3, true, intrinsic_clamp}, {"cross", 2, true, intrinsic_cross}, {"max", 2, true, intrinsic_max}, + {"min", 2, true, intrinsic_min}, {"pow", 2, true, intrinsic_pow}, {"round", 1, true, intrinsic_round}, {"saturate", 1, true, intrinsic_saturate},

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Make pre/post decrement generate a signed one.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 0e45838370f8c06a18617a21e3c986c19f231769 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0e45838370f8c06a18617a2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 1 17:15:00 2021 +0100 vkd3d-shader/hlsl: Make pre/post decrement generate a signed one. If a float expression is pre/post decremented and an unsigned one is used to execute it, the unsigned one is first negated (becoming 2^32-1) and then casted to float (becoming 2^32), which leads to an incorrect result. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl.c | 12 ++++++++++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 934d7e6..20fee06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -304,7 +304,6 @@ XFAIL_TESTS = \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ - tests/math.shader_test \ tests/max.shader_test \ tests/sampler.shader_test \ tests/texture-load.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8d2e08a..d2ea4c3 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -553,6 +553,18 @@ struct hlsl_ir_store *hlsl_new_simple_store(struct hlsl_ctx *ctx, struct hlsl_ir return hlsl_new_store(ctx, lhs, NULL, rhs, 0, rhs->loc); } +struct hlsl_ir_constant *hlsl_new_int_constant(struct hlsl_ctx *ctx, int n, + const struct vkd3d_shader_location loc) +{ + struct hlsl_ir_constant *c; + + if (!(c = hlsl_alloc(ctx, sizeof(*c)))) + return NULL; + init_node(&c->node, HLSL_IR_CONSTANT, hlsl_get_scalar_type(ctx, HLSL_TYPE_INT), loc); + c->value[0].i = n; + return c; +} + struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location loc) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index ea7d6f8..57acf3a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -701,6 +701,8 @@ struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ctx *ctx, struct hlsl_ir_node *no struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, struct list *parameters, const struct hlsl_semantic *semantic, struct vkd3d_shader_location loc); struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct vkd3d_shader_location loc); +struct hlsl_ir_constant *hlsl_new_int_constant(struct hlsl_ctx *ctx, int n, + const struct vkd3d_shader_location loc); struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc); struct hlsl_ir_load *hlsl_new_load(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, struct hlsl_type *type, struct vkd3d_shader_location loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 052a719..131af39 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1255,7 +1255,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, "Argument to %s%screment operator is const.", post ? "post" : "pre", decrement ? "de" : "in"); - if (!(one = hlsl_new_uint_constant(ctx, 1, loc))) + if (!(one = hlsl_new_int_constant(ctx, 1, loc))) return false; list_add_tail(instrs, &one->node.entry);

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
57
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 December 2021