February 2018 - Wine-commits

Józef Kucia : d3d11/tests: Add option to use selected adapter.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 5f46f8f05b59d29d764a7032d0d38e3e78d6f3c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f46f8f05b59d29d764a7032… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 2 14:35:18 2018 +0100 d3d11/tests: Add option to use selected adapter. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/Makefile.in | 2 +- dlls/d3d11/tests/d3d11.c | 76 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/Makefile.in b/dlls/d3d11/tests/Makefile.in index ac95e2e..9612bb3 100644 --- a/dlls/d3d11/tests/Makefile.in +++ b/dlls/d3d11/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d11.dll -IMPORTS = d3d11 user32 gdi32 +IMPORTS = d3d11 dxgi user32 gdi32 C_SRCS = \ d3d11.c diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4fe8110..2b0a577 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1004,6 +1004,48 @@ static void check_texture_uvec4_(unsigned int line, ID3D11Texture2D *texture, check_texture_sub_resource_uvec4_(line, texture, sub_resource_idx, NULL, expected_value); } +static BOOL use_warp_adapter; +static unsigned int use_adapter_idx; + +static IDXGIAdapter *create_adapter(void) +{ + IDXGIFactory4 *factory4; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + HRESULT hr; + + if (!use_warp_adapter && !use_adapter_idx) + return NULL; + + if (FAILED(hr = CreateDXGIFactory1(&IID_IDXGIFactory, (void **)&factory))) + { + trace("Failed to create IDXGIFactory, hr %#x.\n", hr); + return NULL; + } + + adapter = NULL; + if (use_warp_adapter) + { + if (SUCCEEDED(hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4))) + { + hr = IDXGIFactory4_EnumWarpAdapter(factory4, &IID_IDXGIAdapter, (void **)&adapter); + IDXGIFactory4_Release(factory4); + } + else + { + trace("Failed to get IDXGIFactory4, hr %#x.\n", hr); + } + } + else + { + hr = IDXGIFactory_EnumAdapters(factory, use_adapter_idx, &adapter); + } + IDXGIFactory_Release(factory); + if (FAILED(hr)) + trace("Failed to get adapter, hr %#x.\n", hr); + return adapter; +} + static ID3D11Device *create_device(const struct device_desc *desc) { static const D3D_FEATURE_LEVEL default_feature_level[] = @@ -1015,7 +1057,9 @@ static ID3D11Device *create_device(const struct device_desc *desc) const D3D_FEATURE_LEVEL *feature_level; UINT flags = desc ? desc->flags : 0; unsigned int feature_level_count; + IDXGIAdapter *adapter; ID3D11Device *device; + HRESULT hr; if (desc && desc->feature_level) { @@ -1028,14 +1072,22 @@ static ID3D11Device *create_device(const struct device_desc *desc) feature_level_count = ARRAY_SIZE(default_feature_level); } - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags, feature_level, feature_level_count, - D3D11_SDK_VERSION, &device, NULL, NULL))) + if ((adapter = create_adapter())) + { + hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL); + IDXGIAdapter_Release(adapter); + return SUCCEEDED(hr) ? device : NULL; + } + + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, flags, feature_level, feature_level_count, - D3D11_SDK_VERSION, &device, NULL, NULL))) + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, flags, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, flags, feature_level, feature_level_count, - D3D11_SDK_VERSION, &device, NULL, NULL))) + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, flags, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; return NULL; @@ -24738,6 +24790,18 @@ static void test_generate_mips(void) START_TEST(d3d11) { + unsigned int argc, i; + char **argv; + + argc = winetest_get_mainargs(&argv); + for (i = 2; i < argc; ++i) + { + if (!strcmp(argv[i], "--warp")) + use_warp_adapter = TRUE; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); + } + test_create_device(); run_for_each_feature_level(test_device_interfaces); test_get_immediate_context();

1 0

Józef Kucia : d3d11/tests: Print adapter information.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: c7941b59330c2e70f081b60ab4c4d836d75e9029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7941b59330c2e70f081b60a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 2 14:35:19 2018 +0100 d3d11/tests: Print adapter information. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2b0a577..c0cb9a2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1109,6 +1109,20 @@ static void get_device_adapter_desc(ID3D11Device *device, DXGI_ADAPTER_DESC *ada IDXGIAdapter_Release(adapter); } +static void print_adapter_info(void) +{ + DXGI_ADAPTER_DESC adapter_desc; + ID3D11Device *device; + + if (!(device = create_device(NULL))) + return; + + get_device_adapter_desc(device, &adapter_desc); + trace("Adapter: %s, %04x:%04x.\n", wine_dbgstr_w(adapter_desc.Description), + adapter_desc.VendorId, adapter_desc.DeviceId); + ID3D11Device_Release(device); +} + static BOOL is_warp_device(ID3D11Device *device) { DXGI_ADAPTER_DESC adapter_desc; @@ -24802,6 +24816,8 @@ START_TEST(d3d11) use_adapter_idx = atoi(argv[++i]); } + print_adapter_info(); + test_create_device(); run_for_each_feature_level(test_device_interfaces); test_get_immediate_context();

1 0

Henri Verbeet : wined3d: Use the resource access flags in wined3d_texture_set_lod().
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: e6909c8f5008b16c7917dcac1c8be83b3fff6776 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6909c8f5008b16c7917dcac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 2 20:46:50 2018 +0330 wined3d: Use the resource access flags in wined3d_texture_set_lod(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f166c2a..03cf027 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1095,9 +1095,10 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) /* The d3d9:texture test shows that SetLOD is ignored on non-managed * textures. The call always returns 0, and GetLOD always returns 0. */ - if (texture->resource.pool != WINED3D_POOL_MANAGED) + if (!wined3d_resource_access_is_managed(texture->resource.access)) { - TRACE("Ignoring SetLOD on %s texture, returning 0.\n", debug_d3dpool(texture->resource.pool)); + TRACE("Ignoring LOD on texture with resource access %s.\n", + wined3d_debug_resource_access(texture->resource.access)); return 0; }

1 0

Henri Verbeet : wined3d: Use the resource access flags in wined3d_texture_unload().
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 2420d37a9dea52c7605c2343f272995bc5d7f792 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2420d37a9dea52c7605c2343… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 2 20:46:51 2018 +0330 wined3d: Use the resource access flags in wined3d_texture_unload(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 03cf027..5007696 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1803,7 +1803,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[i]; - if (resource->pool != WINED3D_POOL_DEFAULT + if (resource->access & WINED3D_RESOURCE_ACCESS_CPU && wined3d_texture_load_location(texture, i, context, resource->map_binding)) { wined3d_texture_invalidate_location(texture, i, ~resource->map_binding); @@ -1812,9 +1812,11 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { /* We should only get here on device reset/teardown for implicit * resources. */ - if (resource->pool != WINED3D_POOL_DEFAULT || resource->type != WINED3D_RTYPE_TEXTURE_2D) - ERR("Discarding %s %p sub-resource %u in the %s pool.\n", debug_d3dresourcetype(resource->type), - resource, i, debug_d3dpool(resource->pool)); + if (resource->access & WINED3D_RESOURCE_ACCESS_CPU + || resource->type != WINED3D_RTYPE_TEXTURE_2D) + ERR("Discarding %s %p sub-resource %u with resource access %s.\n", + debug_d3dresourcetype(resource->type), resource, i, + wined3d_debug_resource_access(resource->access)); wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_DISCARDED); wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_DISCARDED); }

1 0

Henri Verbeet : wined3d: Use the resource access flags in texture_resource_sub_resource_map().
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: def836347688e772baf52e2bc8b9930a2e38d078 URL: https://source.winehq.org/git/wine.git/?a=commit;h=def836347688e772baf52e2b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 2 20:46:52 2018 +0330 wined3d: Use the resource access flags in texture_resource_sub_resource_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5007696..e480a22 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1872,7 +1872,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour if (box && FAILED(wined3d_texture_check_box_dimensions(texture, texture_level, box))) { WARN("Map box is invalid.\n"); - if (((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && resource->pool == WINED3D_POOL_DEFAULT) + if (((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !(resource->access & WINED3D_RESOURCE_ACCESS_CPU)) || resource->type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; }

1 0

Henri Verbeet : wined3d: Replace the pool in struct wined3d_sub_resource_desc with resource access flags.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 916c13c6c132edbcfc4558a779813a263d0c4e77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=916c13c6c132edbcfc4558a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 2 20:46:53 2018 +0330 wined3d: Replace the pool in struct wined3d_sub_resource_desc with resource access flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 16 ++++++++++++++++ dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 6 +++--- dlls/d3d8/volume.c | 2 +- dlls/d3d9/d3d9_private.h | 16 ++++++++++++++++ dlls/d3d9/device.c | 4 ++-- dlls/d3d9/surface.c | 2 +- dlls/d3d9/texture.c | 6 +++--- dlls/d3d9/volume.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ---- include/wine/wined3d.h | 18 +++++++++++------- 12 files changed, 56 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=916c13c6c132edbcfc45…

1 0

Henri Verbeet : wined3d: Replace the pool in struct wined3d_resource_desc with resource access flags.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 9275b06cc00fbef1016f8c65be21f8d059d31fed URL: https://source.winehq.org/git/wine.git/?a=commit;h=9275b06cc00fbef1016f8c65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 2 20:46:54 2018 +0330 wined3d: Replace the pool in struct wined3d_resource_desc with resource access flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 6 ++++-- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/d3d8_private.h | 17 ++++++++++++---- dlls/d3d8/device.c | 12 ++++-------- dlls/d3d8/texture.c | 30 +++++++++------------------- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/d3d9_private.h | 17 ++++++++++++---- dlls/d3d9/device.c | 12 ++++-------- dlls/d3d9/texture.c | 30 +++++++++------------------- dlls/ddraw/surface.c | 11 ++++++----- dlls/dxgi/device.c | 2 +- dlls/wined3d/buffer.c | 44 ++++++++++++++++++++++++++++-------------- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/resource.c | 29 ++++------------------------ dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 23 +++++++++++----------- dlls/wined3d/utils.c | 15 -------------- dlls/wined3d/wined3d_private.h | 8 +++----- include/wine/wined3d.h | 14 +++++++------- 20 files changed, 128 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9275b06cc00fbef1016f…

1 0

Alexandre Julliard : Release 3.1.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: f9181daa1ddc2c10d3b6ddd4610bc1421cfd0f42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9181daa1ddc2c10d3b6ddd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 19:21:44 2018 +0100 Release 3.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 812 ++++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 479 insertions(+), 355 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9181daa1ddc2c10d3b6…

1 0

Tag wine-3.1 : Alexandre Julliard : Release 3.1
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: refs/tags/wine-3.1 Tag: 2be61d81e0fd3f4f501ce1389e7155f5a300e9e1 URL: https://source.winehq.org/git/wine.git/?a=tag;h=2be61d81e0fd3f4f501ce1389e7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 19:21:44 2018 +0100 Release 3.1

1 0

Nikolay Sivov : comctl32/edit: Fix replacement text trace.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: e0883d8f3f5518e7fe2bd3216e978ab0488d6360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0883d8f3f5518e7fe2bd321… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:41:15 2018 +0300 comctl32/edit: Fix replacement text trace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 5b6773e..a01b75b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2434,7 +2434,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r UINT bufl; TRACE("%s, can_undo %d, send_update %d\n", - debugstr_w(lpsz_replace), can_undo, send_update); + debugstr_wn(lpsz_replace, strl), can_undo, send_update); s = es->selection_start; e = es->selection_end;

1 0