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

Nikolay Sivov : d2d1: Improve GetDC()/ReleaseDC() handling on render targets.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 6526de5c5a5c7d00d858410d146d8d03934c73b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/6526de5c5a5c7d00d858410d146d8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 22 21:54:38 2023 +0200 d2d1: Improve GetDC()/ReleaseDC() handling on render targets. --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/device.c | 23 +++++++++++++++++++---- dlls/d2d1/tests/d2d1.c | 22 +++++++++++++--------- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e343c9998c1..f8dc9f9deb3 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -183,6 +183,7 @@ struct d2d_device_context struct d2d_bitmap *bitmap; struct d2d_command_list *command_list; }; + HDC hdc; } target; struct d2d_shape_resources shape_resources[D2D_SHAPE_TYPE_COUNT]; ID3D11Buffer *vs_cb; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 42db30b2888..6b230f717fe 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -3097,7 +3097,7 @@ static ULONG STDMETHODCALLTYPE d2d_gdi_interop_render_target_Release(ID2D1GdiInt return IUnknown_Release(render_target->outer_unknown); } -static HRESULT d2d_device_context_get_surface(struct d2d_device_context *context, IDXGISurface1 **surface) +static HRESULT d2d_gdi_interop_get_surface(struct d2d_device_context *context, IDXGISurface1 **surface) { ID3D11Resource *resource; HRESULT hr; @@ -3108,6 +3108,9 @@ static HRESULT d2d_device_context_get_surface(struct d2d_device_context *context return E_NOTIMPL; } + if (!(context->target.bitmap->options & D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE)) + return D2DERR_TARGET_NOT_GDI_COMPATIBLE; + ID3D11RenderTargetView_GetResource(context->target.bitmap->rtv, &resource); hr = ID3D11Resource_QueryInterface(resource, &IID_IDXGISurface1, (void **)surface); ID3D11Resource_Release(resource); @@ -3130,12 +3133,20 @@ static HRESULT STDMETHODCALLTYPE d2d_gdi_interop_render_target_GetDC(ID2D1GdiInt TRACE("iface %p, mode %d, dc %p.\n", iface, mode, dc); - if (FAILED(hr = d2d_device_context_get_surface(render_target, &surface))) + *dc = NULL; + + if (render_target->target.hdc) + return D2DERR_WRONG_STATE; + + if (FAILED(hr = d2d_gdi_interop_get_surface(render_target, &surface))) return hr; - hr = IDXGISurface1_GetDC(surface, mode != D2D1_DC_INITIALIZE_MODE_COPY, dc); + hr = IDXGISurface1_GetDC(surface, mode != D2D1_DC_INITIALIZE_MODE_COPY, &render_target->target.hdc); IDXGISurface1_Release(surface); + if (SUCCEEDED(hr)) + *dc = render_target->target.hdc; + return hr; } @@ -3149,9 +3160,13 @@ static HRESULT STDMETHODCALLTYPE d2d_gdi_interop_render_target_ReleaseDC(ID2D1Gd TRACE("iface %p, update rect %s.\n", iface, wine_dbgstr_rect(update)); - if (FAILED(hr = d2d_device_context_get_surface(render_target, &surface))) + if (!render_target->target.hdc) + return D2DERR_WRONG_STATE; + + if (FAILED(hr = d2d_gdi_interop_get_surface(render_target, &surface))) return hr; + render_target->target.hdc = NULL; if (update) update_rect = *update; hr = IDXGISurface1_ReleaseDC(surface, update ? &update_rect : NULL); diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ae0e36f1e17..b00d3fc7444 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6166,7 +6166,7 @@ static void test_dc_target_gdi_interop(BOOL d3d11) hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &hdc); todo_wine ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!hdc, "Got unexpected DC %p.\n", hdc); + ok(!hdc, "Got unexpected DC %p.\n", hdc); hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); @@ -6335,9 +6335,8 @@ static void test_hwnd_target_gdi_interop(BOOL d3d11) ID2D1HwndRenderTarget_BeginDraw(rt); dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); - todo_wine ok(hr == D2DERR_TARGET_NOT_GDI_COMPATIBLE, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!dc, "Got unexpected DC %p.\n", dc); + ok(!dc, "Got unexpected DC %p.\n", dc); hr = ID2D1HwndRenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1GdiInteropRenderTarget_Release(interop); @@ -6441,9 +6440,10 @@ static void test_dxgi_surface_target_gdi_interop(BOOL d3d11) ID2D1RenderTarget_BeginDraw(rt); dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); - todo_wine ok(hr == D2DERR_TARGET_NOT_GDI_COMPATIBLE, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!dc, "Got unexpected DC %p.\n", dc); + ok(!dc, "Got unexpected DC %p.\n", dc); + hr = ID2D1GdiInteropRenderTarget_ReleaseDC(interop, NULL); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1GdiInteropRenderTarget_Release(interop); @@ -6481,6 +6481,9 @@ static void test_dxgi_surface_target_gdi_interop(BOOL d3d11) hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!dc, "Got unexpected DC %p.\n", dc); + hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + ok(!dc, "Got unexpected DC %p.\n", dc); hr = ID2D1GdiInteropRenderTarget_ReleaseDC(interop, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); @@ -6499,8 +6502,10 @@ static void test_dxgi_surface_target_gdi_interop(BOOL d3d11) ID2D1RenderTarget_BeginDraw(rt); dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); - todo_wine ok(hr == D2DERR_TARGET_NOT_GDI_COMPATIBLE, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!dc, "Got unexpected DC %p.\n", dc); + ok(hr == D2DERR_TARGET_NOT_GDI_COMPATIBLE, "Got unexpected hr %#lx.\n", hr); + ok(!dc, "Got unexpected DC %p.\n", dc); + hr = ID2D1GdiInteropRenderTarget_ReleaseDC(interop, NULL); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1GdiInteropRenderTarget_Release(interop); @@ -8781,9 +8786,8 @@ static void test_wic_gdi_interop(BOOL d3d11) ID2D1RenderTarget_BeginDraw(rt); dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); - todo_wine ok(hr == D2DERR_TARGET_NOT_GDI_COMPATIBLE, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!dc, "Got unexpected DC %p.\n", dc); + ok(!dc, "Got unexpected DC %p.\n", dc); ID2D1GdiInteropRenderTarget_Release(interop); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Rémi Bernon : windows.gaming.input: Query IGameController interface in TryGetFactoryControllerFromGameController.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: c0877844e7602dc542384c19c7b0e191daa2b3da URL: https://gitlab.winehq.org/wine/wine/-/commit/c0877844e7602dc542384c19c7b0e1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 22 10:56:51 2023 +0200 windows.gaming.input: Query IGameController interface in TryGetFactoryControllerFromGameController. --- dlls/dinput/tests/hotplug.c | 2 +- dlls/dinput/tests/joystick8.c | 3 +-- dlls/windows.gaming.input/manager.c | 9 ++++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index cd21363770e..7187cf7dc38 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -1184,13 +1184,13 @@ static void test_windows_gaming_input(void) IGameController_Release( tmp_game_controller ); -next: hr = IRawGameControllerStatics_FromGameController( statics, custom_controller.IGameController_outer, &tmp_raw_controller ); ok( hr == S_OK, "FromGameController returned %#lx\n", hr ); todo_wine ok( tmp_raw_controller == raw_controller, "got controller %p\n", tmp_raw_controller ); if (tmp_raw_controller) IRawGameController_Release( tmp_raw_controller ); +next: IGameController_Release( game_controller ); IRawGameController_Release( raw_controller ); SetEvent( stop_event ); diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index e336cc24c6d..191e5273e1d 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -5092,9 +5092,8 @@ static void test_windows_gaming_input(void) hr = IRawGameControllerStatics_FromGameController( controller_statics, (IGameController *)raw_controller, &tmp_raw_controller ); ok( hr == S_OK, "FromGameController returned %#lx\n", hr ); - todo_wine ok( tmp_raw_controller == raw_controller, "got unexpected IGameController interface\n" ); - if (tmp_raw_controller) IRawGameController_Release( tmp_raw_controller ); + IRawGameController_Release( tmp_raw_controller ); IGameController_Release( game_controller ); IRawGameController_Release( raw_controller ); diff --git a/dlls/windows.gaming.input/manager.c b/dlls/windows.gaming.input/manager.c index c2567a2fe3e..d54b01d92e3 100644 --- a/dlls/windows.gaming.input/manager.c +++ b/dlls/windows.gaming.input/manager.c @@ -372,14 +372,18 @@ statics2_TryGetFactoryControllerFromGameController( IGameControllerFactoryManage IGameController *controller, IGameController **value ) { struct controller *entry, *other; + IGameController *tmp_controller; BOOL found = FALSE; TRACE( "iface %p, factory %p, controller %p, value %p.\n", iface, factory, controller, value ); + /* Spider Man Remastered passes a IRawGameController instead of IGameController, query the iface again */ + if (FAILED(IGameController_QueryInterface( controller, &IID_IGameController, (void **)&tmp_controller ))) goto done; + EnterCriticalSection( &manager_cs ); LIST_FOR_EACH_ENTRY( entry, &controller_list, struct controller, entry ) - if ((found = &entry->IGameController_iface == controller)) break; + if ((found = &entry->IGameController_iface == tmp_controller)) break; if (!found) WARN( "Failed to find controller %p\n", controller ); else @@ -392,6 +396,9 @@ statics2_TryGetFactoryControllerFromGameController( IGameControllerFactoryManage LeaveCriticalSection( &manager_cs ); + IGameController_Release( tmp_controller ); + +done: if (!found) *value = NULL; return S_OK; }

1 0

Nikolay Sivov : d2d1: Create GDI-compatible target bitmap for GDI-compatible target usage.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 981db8313fc305412add7c91c36f4f72bad5a0da URL: https://gitlab.winehq.org/wine/wine/-/commit/981db8313fc305412add7c91c36f4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 22 20:08:50 2023 +0200 d2d1: Create GDI-compatible target bitmap for GDI-compatible target usage. --- dlls/d2d1/device.c | 2 ++ dlls/d2d1/tests/d2d1.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 93fcecf72ba..42db30b2888 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -4456,6 +4456,8 @@ HRESULT d2d_d3d_create_render_target(ID2D1Device *device, IDXGISurface *surface, { bitmap_desc.pixelFormat = desc->pixelFormat; bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + if (desc->usage & D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE) + bitmap_desc.bitmapOptions |= D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE; bitmap_desc.colorContext = NULL; if (FAILED(hr = ID2D1DeviceContext1_CreateBitmapFromDxgiSurface(&object->ID2D1DeviceContext1_iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bff93c1815c..ae0e36f1e17 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6453,10 +6453,7 @@ static void test_dxgi_surface_target_gdi_interop(BOOL d3d11) desc.usage = D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE; hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(ctx.factory, surface, &desc, &rt); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ID2D1RenderTarget_Release(rt); refcount = IDXGISurface_Release(surface); ok(!refcount, "Unexpected refcount %lu.\n", refcount);

1 0

Nikolay Sivov : d2d1: Implement IsSupported() for DC target.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: df50411fac9a1dc56ce1b80888e923d374c831f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/df50411fac9a1dc56ce1b80888e923… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 20 01:05:37 2023 +0200 d2d1: Implement IsSupported() for DC target. --- dlls/d2d1/d2d1_private.h | 3 +- dlls/d2d1/dc_render_target.c | 30 +++++- dlls/d2d1/tests/d2d1.c | 233 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 262 insertions(+), 4 deletions(-)

1 0

Nikolay Sivov : d2d1/tests: Add some more tests for ID2D1GdiInteropRenderTarget.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 612020f952254fcd3b2c6e237530a1e3b19c4ff5 URL: https://gitlab.winehq.org/wine/wine/-/commit/612020f952254fcd3b2c6e237530a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 22 01:13:35 2023 +0200 d2d1/tests: Add some more tests for ID2D1GdiInteropRenderTarget. --- dlls/d2d1/tests/d2d1.c | 344 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 299 insertions(+), 45 deletions(-)

1 0

Nikolay Sivov : d2d1: Reject D2D1_ALPHA_MODE_STRAIGHT alpha mode for HWND targets.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: ae43a87d017ca28a7f246e5d755a50c73a4024df URL: https://gitlab.winehq.org/wine/wine/-/commit/ae43a87d017ca28a7f246e5d755a50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 21 15:58:40 2023 +0200 d2d1: Reject D2D1_ALPHA_MODE_STRAIGHT alpha mode for HWND targets. --- dlls/d2d1/hwnd_render_target.c | 7 +++++++ dlls/d2d1/tests/d2d1.c | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 325eb941782..a62f31b909d 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -862,6 +862,13 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target if (dxgi_rt_desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_UNKNOWN) dxgi_rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + if (dxgi_rt_desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_STRAIGHT) + { + IDXGIFactory_Release(dxgi_factory); + WARN("Alpha mode %u is not supported.\n", dxgi_rt_desc.pixelFormat.alphaMode); + return D2DERR_UNSUPPORTED_PIXEL_FORMAT; + } + render_target->desc = dxgi_rt_desc; /* FIXME: should be resolved to either HW or SW type. */ if (render_target->desc.type == D2D1_RENDER_TARGET_TYPE_DEFAULT) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f0b0da732df..1607bacd2bc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6214,10 +6214,7 @@ static void test_hwnd_target(BOOL d3d11) hr = ID2D1Factory_CreateHwndRenderTarget(ctx.factory, &desc, &hwnd_rt_desc, &rt); if (format_tests[i].expected_failure) { - todo_wine - ok(FAILED(hr), "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ID2D1HwndRenderTarget_Release(rt); + ok(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT, "Got unexpected hr %#lx.\n", hr); winetest_pop_context(); continue; }

1 0

Nikolay Sivov : d2d1/tests: Use test context for more tests.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 02919e4298513c6c21e8ff0fe29c0615f6259245 URL: https://gitlab.winehq.org/wine/wine/-/commit/02919e4298513c6c21e8ff0fe29c06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 21 14:37:09 2023 +0200 d2d1/tests: Use test context for more tests. --- dlls/d2d1/tests/d2d1.c | 217 ++++++++++++++++++++----------------------------- 1 file changed, 87 insertions(+), 130 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_nequal().
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: vkd3d Branch: master Commit: 855bb71f6dc41ae061ecbfdfec1512604c224fda URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/855bb71f6dc41ae061ecbfdfec151… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:49:14 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_nequal(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 015b2222..80af9b8f 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -257,12 +257,12 @@ static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } -static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, - struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { unsigned int k; - assert(dst->node.data_type->base_type == HLSL_TYPE_BOOL); + assert(dst_type->base_type == HLSL_TYPE_BOOL); assert(src1->node.data_type->base_type == src2->node.data_type->base_type); for (k = 0; k < 4; ++k) @@ -271,24 +271,24 @@ static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - dst->value.u[k].u = src1->value.u[k].f != src2->value.u[k].f; + dst->u[k].u = src1->value.u[k].f != src2->value.u[k].f; break; case HLSL_TYPE_DOUBLE: - dst->value.u[k].u = src1->value.u[k].d != src2->value.u[k].d; + dst->u[k].u = src1->value.u[k].d != src2->value.u[k].d; break; case HLSL_TYPE_INT: case HLSL_TYPE_UINT: case HLSL_TYPE_BOOL: - dst->value.u[k].u = src1->value.u[k].u != src2->value.u[k].u; + dst->u[k].u = src1->value.u[k].u != src2->value.u[k].u; break; default: vkd3d_unreachable(); } - dst->value.u[k].u *= ~0u; + dst->u[k].u *= ~0u; } return true; } @@ -596,7 +596,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_NEQUAL: - success = fold_nequal(ctx, res, arg1, arg2); + success = fold_nequal(ctx, &res->value, instr->data_type, arg1, arg2); break; case HLSL_OP2_DIV:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_mul().
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: vkd3d Branch: master Commit: d565caafb513e216b0c829bc27ffd535622ae967 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d565caafb513e216b0c829bc27ffd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:48:13 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_mul(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 24ebbf8d..015b2222 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -222,10 +222,10 @@ static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } -static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, - struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src1->node.data_type->base_type); @@ -237,20 +237,20 @@ static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - dst->value.u[k].f = src1->value.u[k].f * src2->value.u[k].f; + dst->u[k].f = src1->value.u[k].f * src2->value.u[k].f; break; case HLSL_TYPE_DOUBLE: - dst->value.u[k].d = src1->value.u[k].d * src2->value.u[k].d; + dst->u[k].d = src1->value.u[k].d * src2->value.u[k].d; break; case HLSL_TYPE_INT: case HLSL_TYPE_UINT: - dst->value.u[k].u = src1->value.u[k].u * src2->value.u[k].u; + dst->u[k].u = src1->value.u[k].u * src2->value.u[k].u; break; default: - FIXME("Fold multiplication for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold multiplication for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -592,7 +592,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_MUL: - success = fold_mul(ctx, res, arg1, arg2); + success = fold_mul(ctx, &res->value, instr->data_type, arg1, arg2); break; case HLSL_OP2_NEQUAL:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_neg().
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: vkd3d Branch: master Commit: 7d9b24fe11e88e7e2c757acd2fd63e5ab7cb31bb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d9b24fe11e88e7e2c757acd2fd63… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:46:10 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_neg(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 676126d7..2a2b4729 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -151,9 +151,10 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, return true; } -static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src) +static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, + const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src->node.data_type->base_type); @@ -164,20 +165,20 @@ static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - dst->value.u[k].f = -src->value.u[k].f; + dst->u[k].f = -src->value.u[k].f; break; case HLSL_TYPE_DOUBLE: - dst->value.u[k].d = -src->value.u[k].d; + dst->u[k].d = -src->value.u[k].d; break; case HLSL_TYPE_INT: case HLSL_TYPE_UINT: - dst->value.u[k].u = -src->value.u[k].u; + dst->u[k].u = -src->value.u[k].u; break; default: - FIXME("Fold negation for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold negation for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -583,7 +584,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP1_NEG: - success = fold_neg(ctx, res, arg1); + success = fold_neg(ctx, &res->value, instr->data_type, arg1); break; case HLSL_OP2_ADD:

1 0