wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetScissorRect().
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 08ae44e82d643e371c8be65323411d67a5e2745c URL: https://source.winehq.org/git/wine.git/?a=commit;h=08ae44e82d643e371c8be653… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 18:28:52 2019 -0600 d3d9: Handle stateblocks in d3d9_device_SetScissorRect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b4ba9223e0..d83c24a640 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2685,7 +2685,9 @@ static HRESULT WINAPI d3d9_device_SetScissorRect(IDirect3DDevice9Ex *iface, cons TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, 1, rect); + wined3d_stateblock_set_scissor_rect(device->update_state, rect); + if (!device->recording) + wined3d_device_set_scissor_rects(device->wined3d_device, 1, rect); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_scissor_rect().
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 0383f62b3ced50ca372190b4331f3df7fca05336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0383f62b3ced50ca372190b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 18:28:51 2019 -0600 wined3d: Introduce wined3d_stateblock_set_scissor_rect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 10 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1d522ad89b..df0bca33b0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1555,6 +1555,14 @@ void CDECL wined3d_stateblock_set_viewport(struct wined3d_stateblock *stateblock stateblock->changed.viewport = TRUE; } +void CDECL wined3d_stateblock_set_scissor_rect(struct wined3d_stateblock *stateblock, const RECT *rect) +{ + TRACE("stateblock %p, rect %s.\n", stateblock, wine_dbgstr_rect(rect)); + + stateblock->stateblock_state.scissor_rect = *rect; + stateblock->changed.scissorRect = TRUE; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 48e5ea954b..4041db56da 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -272,6 +272,7 @@ @ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_stateblock_set_render_state(ptr long long) @ cdecl wined3d_stateblock_set_sampler_state(ptr long long long) +@ cdecl wined3d_stateblock_set_scissor_rect(ptr ptr) @ cdecl wined3d_stateblock_set_texture(ptr long ptr) @ cdecl wined3d_stateblock_set_texture_stage_state(ptr long long long) @ cdecl wined3d_stateblock_set_transform(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c311ded731..e723678601 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2684,6 +2684,7 @@ void __cdecl wined3d_stateblock_set_render_state(struct wined3d_stateblock *stat enum wined3d_render_state state, DWORD value); void __cdecl wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); +void __cdecl wined3d_stateblock_set_scissor_rect(struct wined3d_stateblock *stateblock, const RECT *rect); void __cdecl wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, UINT stage, struct wined3d_texture *texture); void __cdecl wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock *stateblock, UINT stage, enum wined3d_texture_stage_state state, DWORD value);

1 0

Conor McCarthy : dxgi/tests: Add tests for IDXGISwapChain3::ResizeBuffers1().
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: a7cd70a8c842fdc1a0135a3bab274385af47ee92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7cd70a8c842fdc1a0135a3b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Nov 8 00:54:41 2019 +1000 dxgi/tests: Add tests for IDXGISwapChain3::ResizeBuffers1(). 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> --- dlls/dxgi/tests/dxgi.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b05e7f8bf9..874c39b88e 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3534,6 +3534,8 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) { DXGI_SWAP_CHAIN_DESC swapchain_desc; DXGI_SWAP_EFFECT swap_effect; + IDXGISwapChain3 *swapchain3; + IUnknown *present_queue[2]; IDXGISwapChain *swapchain; ID3D12Resource *resource; ID3D10Texture2D *texture; @@ -3541,6 +3543,7 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) IDXGISurface *surface; IDXGIFactory *factory; RECT client_rect, r; + UINT node_mask[2]; ULONG refcount; HWND window; BOOL ret; @@ -3803,6 +3806,41 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) ok(!swapchain_desc.Flags, "Got unexpected Flags %#x.\n", swapchain_desc.Flags); + node_mask[0] = 1; + node_mask[1] = 1; + present_queue[0] = device; + present_queue[1] = device; + if (IDXGISwapChain_QueryInterface(swapchain, &IID_IDXGISwapChain3, (void **)&swapchain3) == E_NOINTERFACE) + { + skip("IDXGISwapChain3 is not supported.\n"); + } + else if (!is_d3d12) + { + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + IDXGISwapChain3_Release(swapchain3); + } + else + { + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue); + ok(hr == S_OK, "Failed to resize buffers, hr %#x.\n", hr); + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, present_queue); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 0, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + node_mask[0] = 2; + node_mask[1] = 2; + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + /* Windows validates node masks even when the buffer count is zero. It defaults to the current buffer count. + * NULL queues cause some Windows versions to crash. */ + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 0, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + IDXGISwapChain3_Release(swapchain3); + } + IDXGISwapChain_Release(swapchain); DestroyWindow(window); refcount = IDXGIFactory_Release(factory);

1 0

Conor McCarthy : dxgi: Implement IDXGISwapChain3::ResizeBuffers1().
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 58b482c9f4bb98fd2fcc534476669e71d3292153 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58b482c9f4bb98fd2fcc5344… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Nov 8 00:54:34 2019 +1000 dxgi: Implement IDXGISwapChain3::ResizeBuffers1(). Used by Hitman 2. Multiple nodes and command queues are not supported. 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> --- dlls/dxgi/swapchain.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 9e620e0b1e..004bd1457d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2311,17 +2311,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain3 *iface, return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 *iface, +static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain, UINT buffer_count, UINT width, UINT height, DXGI_FORMAT format, UINT flags) { - struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); DXGI_SWAP_CHAIN_DESC1 *desc, new_desc; unsigned int i; ULONG refcount; - TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", - iface, buffer_count, width, height, debug_dxgi_format(format), flags); - if (flags) FIXME("Ignoring flags %#x.\n", flags); @@ -2373,6 +2369,17 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); } +static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 *iface, + UINT buffer_count, UINT width, UINT height, DXGI_FORMAT format, UINT flags) +{ + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + + TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", + iface, buffer_count, width, height, debug_dxgi_format(format), flags); + + return d3d12_swapchain_resize_buffers(swapchain, buffer_count, width, height, format, flags); +} + static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *iface, const DXGI_MODE_DESC *target_mode_desc) { @@ -2642,11 +2649,26 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers1(IDXGISwapChain3 UINT buffer_count, UINT width, UINT height, DXGI_FORMAT format, UINT flags, const UINT *node_mask, IUnknown * const *present_queue) { - FIXME("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x, " - "node_mask %p, present_queue %p stub!\n", + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + size_t i, count; + + TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x, " + "node_mask %p, present_queue %p.\n", iface, buffer_count, width, height, debug_dxgi_format(format), flags, node_mask, present_queue); - return E_NOTIMPL; + if (!node_mask || !present_queue) + return DXGI_ERROR_INVALID_CALL; + + count = buffer_count ? buffer_count : swapchain->desc.BufferCount; + for (i = 0; i < count; ++i) + { + if (node_mask[i] > 1 || !present_queue[i]) + return DXGI_ERROR_INVALID_CALL; + if ((ID3D12CommandQueue*)present_queue[i] != swapchain->command_queue) + FIXME("Ignoring present queue %p.\n", present_queue[i]); + } + + return d3d12_swapchain_resize_buffers(swapchain, buffer_count, width, height, format, flags); } static const struct IDXGISwapChain3Vtbl d3d12_swapchain_vtbl =

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.1.126.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 0425b6ad64791088adc13b74626dd8ac6e192420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0425b6ad64791088adc13b74… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:05 2019 -0700 winevulkan: Update to VK spec version 1.1.126. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 222 +++++++ dlls/winevulkan/vulkan_thunks.h | 53 +- include/wine/vulkan.h | 1401 +++++++++++++++++++++++---------------- 4 files changed, 1097 insertions(+), 581 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0425b6ad64791088adc1…

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.1.117.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 54acff1227488bae34e4bd7d7ad01c67a23f21b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54acff1227488bae34e4bd7d… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:04 2019 -0700 winevulkan: Update to VK spec version 1.1.117. Adds int16 types needed for spec update. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 6 +- dlls/winevulkan/vulkan_thunks.c | 76 +- dlls/winevulkan/vulkan_thunks.h | 2 + include/wine/vulkan.h | 1527 +++++++++++++++++++++------------------ 4 files changed, 903 insertions(+), 708 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54acff1227488bae34e4…

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.1.114.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 9126cd623e78d1feee1c16e088c6ebd2f3b9bc92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9126cd623e78d1feee1c16e0… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:03 2019 -0700 winevulkan: Update to VK spec version 1.1.114. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 17 ++ include/wine/vulkan.h | 354 +++++++++++++++++++++++----------------- 3 files changed, 219 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9126cd623e78d1feee1c…

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.1.113.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 7e736b5903d3d078bbf7bb6a509536a942f6b9a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e736b5903d3d078bbf7bb6a… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:01 2019 -0700 winevulkan: Update to VK spec version 1.1.113. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 260 ++++++- dlls/winevulkan/vulkan_thunks.h | 46 ++ include/wine/vulkan.h | 1631 +++++++++++++++++++++++---------------- 4 files changed, 1252 insertions(+), 687 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e736b5903d3d078bbf7…

1 0

Liam Middlebrook : winevulkan: Don't add alias structs to struct-extensions list.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: b5752327125bc5f8bc6de16bb0bffe0fc096c973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5752327125bc5f8bc6de16b… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:00 2019 -0700 winevulkan: Don't add alias structs to struct-extensions list. This resolves compilation errors relating to duplicate case values for alias structures when building against spec version 1.1.106. An example of one of these errors has been included below: vulkan_thunks.c: In function ‘convert_VkDeviceCreateInfo_struct_chain’: vulkan_thunks.c:1997:9: error: duplicate case value case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES: ^~~~ vulkan_thunks.c:1377:9: note: previously used here case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES: ^~~~ Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3b80005c58..92be0941ed 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2962,6 +2962,13 @@ class VkRegistry(object): for struct in structs: struct.set_type_info(self.types) + # Alias structures have enum values equivalent to those of the + # structure which they are aliased against. we need to ignore alias + # structs when populating the struct extensions list, otherwise we + # will create duplicate case entries. + if struct.alias: + continue + for structextend in struct.structextends: s = self.types[structextend]["data"] s.struct_extensions.append(struct)

1 0

Derek Lesho : winevulkan: Mark members of required structs as required recursively.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 410f5623e706b5b9b914c3934c8070872bc1d3c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=410f5623e706b5b9b914c393… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Oct 30 16:12:36 2019 -0500 winevulkan: Mark members of required structs as required recursively. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 4f1c03cc7c..3b80005c58 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2718,6 +2718,16 @@ class VkRegistry(object): elif "value" in enum_elem.keys(): self.consts.append(VkConstant(enum_elem.attrib["name"], enum_elem.attrib["value"])) + @staticmethod + def _require_type(type_info): + if type_info.is_alias(): + type_info = type_info.alias + type_info.required = True + if type(type_info) == VkStruct: + for member in type_info.members: + if "data" in member.type_info: + VkRegistry._require_type(member.type_info["data"]) + def _parse_extensions(self, root): """ Parse extensions section and pull in any types and commands for this extensioin. """ extensions = [] @@ -2771,10 +2781,7 @@ class VkRegistry(object): for t in require.findall("type"): type_info = self.types[t.attrib["name"]]["data"] - if type_info.is_alias(): - type_info = type_info.alias - type_info.required = True - + self._require_type(type_info) feature = require.attrib.get("feature") if feature and not self._is_feature_supported(feature): continue

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
90
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 November 2019