wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Józef Kucia : vkd3d: Improve heuristic for selecting physical device.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: vkd3d Branch: master Commit: 269bb649d7ade5455c7d8903a3da43c9697f0bf0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=269bb649d7ade5455c7d890… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:28 2019 +0100 vkd3d: Improve heuristic for selecting physical device. 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> --- libs/vkd3d/device.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5265ec9..b71d442 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -573,20 +573,19 @@ VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance) } static void vkd3d_trace_physical_device(VkPhysicalDevice device, + const VkPhysicalDeviceProperties *vk_device_properties, const struct vkd3d_vk_instance_procs *vk_procs) { VkPhysicalDeviceMemoryProperties memory_properties; - VkPhysicalDeviceProperties device_properties; VkQueueFamilyProperties *queue_properties; unsigned int i, j; uint32_t count; - VK_CALL(vkGetPhysicalDeviceProperties(device, &device_properties)); - TRACE("Device name: %s.\n", device_properties.deviceName); - TRACE("Vendor ID: %#x, Device ID: %#x.\n", device_properties.vendorID, device_properties.deviceID); - TRACE("Driver version: %#x.\n", device_properties.driverVersion); - TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(device_properties.apiVersion), - VK_VERSION_MINOR(device_properties.apiVersion), VK_VERSION_PATCH(device_properties.apiVersion)); + TRACE("Device name: %s.\n", vk_device_properties->deviceName); + TRACE("Vendor ID: %#x, Device ID: %#x.\n", vk_device_properties->vendorID, vk_device_properties->deviceID); + TRACE("Driver version: %#x.\n", vk_device_properties->driverVersion); + TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(vk_device_properties->apiVersion), + VK_VERSION_MINOR(vk_device_properties->apiVersion), VK_VERSION_PATCH(vk_device_properties->apiVersion)); VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(device, &count, NULL)); TRACE("Queue families [%u]:\n", count); @@ -1031,8 +1030,10 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, VkPhysicalDevice *selected_device) { + VkPhysicalDevice dgpu_device = VK_NULL_HANDLE, igpu_device = VK_NULL_HANDLE; const struct vkd3d_vk_instance_procs *vk_procs = &instance->vk_procs; VkInstance vk_instance = instance->vk_instance; + VkPhysicalDeviceProperties device_properties; VkPhysicalDevice *physical_devices; uint32_t count; unsigned int i; @@ -1061,15 +1062,26 @@ static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, } for (i = 0; i < count; ++i) - vkd3d_trace_physical_device(physical_devices[i], vk_procs); + { + VK_CALL(vkGetPhysicalDeviceProperties(physical_devices[i], &device_properties)); + vkd3d_trace_physical_device(physical_devices[i], &device_properties, vk_procs); - if (count > 1) - FIXME("Multiple physical devices available, selecting the first one.\n"); + if (device_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU && !dgpu_device) + dgpu_device = physical_devices[i]; + else if (device_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU && !igpu_device) + igpu_device = physical_devices[i]; + } - *selected_device = physical_devices[0]; + *selected_device = dgpu_device ? dgpu_device : igpu_device; + if (!*selected_device) + *selected_device = physical_devices[0]; vkd3d_free(physical_devices); + VK_CALL(vkGetPhysicalDeviceProperties(*selected_device, &device_properties)); + TRACE("Using device: %s, %#x:%#x.\n", device_properties.deviceName, + device_properties.vendorID, device_properties.deviceID); + return S_OK; }

1 0

Michael Stefaniuc : d3dxof: Remove useless casts.
by Alexandre Julliard 12 Feb '19

12 Feb '19

Module: wine Branch: master Commit: 9781b5433cd4b708c0f537aa0b5608ff4157f04c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9781b5433cd4b708c0f537aa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 12 18:29:26 2019 +0100 d3dxof: Remove useless casts. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/parsing.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index f7724ec..6f93bfe 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1208,13 +1208,13 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; if (pt->members[i].type == TOKEN_WORD) { - *(((WORD*)(buf->pdata + buf->cur_pos_data))) = (WORD)(*(DWORD*)buf->value); - buf->cur_pos_data += 2; + *(WORD *)(buf->pdata + buf->cur_pos_data) = *(DWORD *)buf->value; + buf->cur_pos_data += 2; } else if (pt->members[i].type == TOKEN_DWORD) { - *(((DWORD*)(buf->pdata + buf->cur_pos_data))) = (DWORD)(*(DWORD*)buf->value); - buf->cur_pos_data += 4; + *(DWORD *)(buf->pdata + buf->cur_pos_data) = *(DWORD *)buf->value; + buf->cur_pos_data += 4; } else { @@ -1230,8 +1230,8 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; if (pt->members[i].type == TOKEN_FLOAT) { - *(((float*)(buf->pdata + buf->cur_pos_data))) = (float)(*(float*)buf->value); - buf->cur_pos_data += 4; + *(float *)(buf->pdata + buf->cur_pos_data) = *(float *)buf->value; + buf->cur_pos_data += 4; } else {

1 0

Nikolay Sivov : d2d1: Add ID2D1GeometryGroup stub.
by Alexandre Julliard 12 Feb '19

12 Feb '19

Module: wine Branch: master Commit: a777fd85cb51698580ee26921f04e551d4b82d8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a777fd85cb51698580ee2692… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 12 18:06:42 2019 +0300 d2d1: Add ID2D1GeometryGroup stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 8 ++ dlls/d2d1/factory.c | 20 +++- dlls/d2d1/geometry.c | 265 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 290 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a777fd85cb51698580ee…

1 0

Józef Kucia : wined3d: Remove unnecessary src_format NULL check from glsl_blitter_supported().
by Alexandre Julliard 12 Feb '19

12 Feb '19

Module: wine Branch: master Commit: e778a210f845bf9891a94271571de2e63dd628e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e778a210f845bf9891a94271… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 16:32:17 2019 +0100 wined3d: Remove unnecessary src_format NULL check from glsl_blitter_supported(). 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/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 970fa4b..c83d5f6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13145,7 +13145,7 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi /* We don't necessarily want to blit from resources without * WINED3D_RESOURCE_ACCESS_GPU, but that may be the only way to decompress * compressed textures. */ - decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + decompress = (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) {

1 0

Józef Kucia : wined3d: Remove unnecessary src_format NULL check from ffp_blit_supported().
by Alexandre Julliard 12 Feb '19

12 Feb '19

Module: wine Branch: master Commit: 5fc64a30573164e8d15699c6ce3abe2fdd482f46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fc64a30573164e8d15699c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 16:32:16 2019 +0100 wined3d: Remove unnecessary src_format NULL check from ffp_blit_supported(). 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/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0ee2f82..4d5b777 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1964,7 +1964,7 @@ static BOOL ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) return FALSE; - decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + decompress = (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) {

1 0

Józef Kucia : wined3d: Remove unnecessary src_format NULL check from arbfp_blit_supported().
by Alexandre Julliard 12 Feb '19

12 Feb '19

Module: wine Branch: master Commit: 433af4eed586fecb23e70910a6cc2ae5f5cc7aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=433af4eed586fecb23e70910… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 16:32:15 2019 +0100 wined3d: Remove unnecessary src_format NULL check from arbfp_blit_supported(). 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/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 37ec7e9..6b6df16 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7714,7 +7714,7 @@ static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wine return FALSE; } - decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + decompress = (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE;

1 0

Józef Kucia : wined3d: Factor out shader_get_stream_output_register_info().
by Alexandre Julliard 12 Feb '19

12 Feb '19

Module: wine Branch: master Commit: 45deb5aa2412af676b3484f8fe6dbeca81b94dfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=45deb5aa2412af676b3484f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 16:32:14 2019 +0100 wined3d: Factor out shader_get_stream_output_register_info(). 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/wined3d/glsl_shader.c | 52 +++++++++++------------------------------- dlls/wined3d/shader.c | 37 ++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 5 ++-- 3 files changed, 43 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=45deb5aa2412af676b34…

1 0

Józef Kucia : wined3d: Keep original component index in stream output elements.
by Alexandre Julliard 12 Feb '19

12 Feb '19

Module: wine Branch: master Commit: a2ea5a98ee47eb6bd38aeb65fe06390e1c9982b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2ea5a98ee47eb6bd38aeb65… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 16:32:13 2019 +0100 wined3d: Keep original component index in stream output elements. 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/wined3d/glsl_shader.c | 83 +++++++++++++++++++++++++++++------------- dlls/wined3d/shader.c | 18 +++------ dlls/wined3d/wined3d_private.h | 5 ++- 3 files changed, 66 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a2ea5a98ee47eb6bd38a…

1 0

Józef Kucia : wined3d: Export wined3d_extract_shader_input_signature_from_dxbc().
by Alexandre Julliard 12 Feb '19

12 Feb '19

Module: wine Branch: master Commit: b7509345891d3f857673d8e5da6ec8edabcb078f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7509345891d3f857673d8e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 16:32:12 2019 +0100 wined3d: Export wined3d_extract_shader_input_signature_from_dxbc(). 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/d3d11_private.h | 22 ---------- dlls/d3d11/inputlayout.c | 28 ++++++------ dlls/d3d11/shader.c | 104 --------------------------------------------- dlls/d3d11/utils.c | 83 ------------------------------------ dlls/wined3d/shader_sm4.c | 23 ++++++++++ dlls/wined3d/wined3d.spec | 2 + include/wine/wined3d.h | 3 ++ 7 files changed, 42 insertions(+), 223 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b7509345891d3f857673…

1 0

Michael Stefaniuc : d3d10core/tests: Remove useless casts to self.
by Alexandre Julliard 12 Feb '19

12 Feb '19

Module: wine Branch: master Commit: 4f698de563181363235a5a0b3922fe764fc33921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f698de563181363235a5a0b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 11 22:34:57 2019 +0100 d3d10core/tests: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 5b8e7e1..9c322ed 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1648,7 +1648,7 @@ static void test_create_texture1d(void) desc.Format = DXGI_FORMAT_R32G32B32A32_TYPELESS; desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, (ID3D10Texture1D **)&texture); + hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, &texture); ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); if (SUCCEEDED(hr)) ID3D10Texture1D_Release(texture); @@ -1979,7 +1979,7 @@ static void test_create_texture2d(void) desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; desc.MiscFlags = tests[i].misc_flags; - hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, (ID3D10Texture2D **)&texture); + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); todo_wine_if(tests[i].todo) ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), @@ -2223,7 +2223,7 @@ static void test_create_texture3d(void) { desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; - hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, (ID3D10Texture3D **)&texture); + hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture); todo_wine_if(tests[i].todo) ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -7634,8 +7634,8 @@ static void test_cube_maps(void) { for (j = 0; j < ARRAY_SIZE(data); ++j) data[j] = sub_resource_idx; - ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, sub_resource_idx, NULL, - data, texture_desc.Width * sizeof(*data), 0); + ID3D10Device_UpdateSubresource(device, texture, sub_resource_idx, NULL, data, + texture_desc.Width * sizeof(*data), 0); } expected_result.y = expected_result.z = 0.0f;

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
68
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 February 2019