wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Zhiyi Zhang : wined3d: Refactor wined3d_set_adapter_display_mode() to wined3d_output_set_display_mode().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 7161e01ad82f041fb719df969ffdcedcba07a0fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7161e01ad82f041fb719df96… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 6 21:16:16 2020 +0800 wined3d: Refactor wined3d_set_adapter_display_mode() to wined3d_output_set_display_mode(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 4 ++-- dlls/wined3d/directx.c | 31 +++++++++++++------------------ dlls/wined3d/swapchain.c | 30 ++++++++++++++++++------------ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 4 ++-- 6 files changed, 37 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7161e01ad82f041fb719…

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_display_mode().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 3635e09dd51ae37331c1a33236bd026a36ffbef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3635e09dd51ae37331c1a332… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 6 21:16:02 2020 +0800 wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_display_mode(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 312e8f2d24..65935a6165 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1430,19 +1430,19 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha } static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_display_mode *mode) + struct wined3d *wined3d, struct wined3d_output *output, struct wined3d_display_mode *mode) { HRESULT hr; if (state->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE) { - if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter_idx, mode))) + if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, 0, mode))) { WARN("Failed to find closest matching mode, hr %#x.\n", hr); } } - if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, adapter_idx, mode))) + if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, 0, mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; @@ -1480,7 +1480,8 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, + &actual_mode))) { wined3d_mutex_unlock(); return hr; @@ -1649,7 +1650,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st } } - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, + &actual_mode))) return hr; } else

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_resize_target().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: be5be587698d790f39d6963684618f823847c091 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be5be587698d790f39d69636… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 6 21:15:30 2020 +0800 wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_resize_target(). Signed-off-by: Zhiyi Zhang <zzhang(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 | 6 ++++-- dlls/wined3d/swapchain.c | 9 +++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 603cf171e2..25e994c5fe 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -189,7 +189,6 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, return hr; dxgi_output = unsafe_impl_from_IDXGIOutput(output); adapter = dxgi_output->adapter; - IDXGIOutput_Release(output); TRACE("Mode: %s.\n", debug_dxgi_mode(target_mode_desc)); @@ -198,7 +197,10 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, wined3d_display_mode_from_dxgi(&mode, target_mode_desc); - return wined3d_swapchain_state_resize_target(state, adapter->factory->wined3d, adapter->ordinal, &mode); + hr = wined3d_swapchain_state_resize_target(state, adapter->factory->wined3d, + dxgi_output->wined3d_output, &mode); + IDXGIOutput_Release(output); + return hr; } static HWND d3d11_swapchain_get_hwnd(struct d3d11_swapchain *swapchain) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index be41cc385e..312e8f2d24 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1452,14 +1452,15 @@ static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain } HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, const struct wined3d_display_mode *mode) + struct wined3d *wined3d, struct wined3d_output *output, + const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; RECT original_window_rect, window_rect; HWND window; HRESULT hr; - TRACE("state %p, wined3d %p, adapter_idx %u, mode %p.\n", state, wined3d, adapter_idx, mode); + TRACE("state %p, wined3d %p, output %p, mode %p.\n", state, wined3d, output, mode); wined3d_mutex_lock(); @@ -1479,7 +1480,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, adapter_idx, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) { wined3d_mutex_unlock(); return hr; @@ -1488,7 +1489,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta } else { - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &actual_mode, NULL))) + if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, 0, &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5c3efbdc8b..2dbb394444 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -282,7 +282,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr long ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) -@ cdecl wined3d_swapchain_state_resize_target(ptr ptr long ptr) +@ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3b7b837d3e..265f6f885b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2762,7 +2762,8 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de HWND window, struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, - struct wined3d *wined3d, unsigned int adapter_idx, const struct wined3d_display_mode *mode); + struct wined3d *wined3d, struct wined3d_output *output, + const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *desc, struct wined3d *wined3d, struct wined3d_output *output, const struct wined3d_display_mode *mode);

1 0

Dmitry Timoshkov : dnsapi/tests: Add some DnsQuery tests.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 8dc3e01d5186c8a4be47a435b3a7e5835d05c01a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dc3e01d5186c8a4be47a435… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 6 20:28:35 2020 +0800 dnsapi/tests: Add some DnsQuery tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/tests/Makefile.in | 3 +- dlls/dnsapi/tests/query.c | 115 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in index 14c8f30fd1..f476103b09 100644 --- a/dlls/dnsapi/tests/Makefile.in +++ b/dlls/dnsapi/tests/Makefile.in @@ -1,7 +1,8 @@ TESTDLL = dnsapi.dll -IMPORTS = dnsapi +IMPORTS = dnsapi ws2_32 C_SRCS = \ cache.c \ name.c \ + query.c \ record.c diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c new file mode 100644 index 0000000000..5ec5181bd0 --- /dev/null +++ b/dlls/dnsapi/tests/query.c @@ -0,0 +1,115 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "windns.h" +#include "winsock2.h" +#include "ws2ipdef.h" + +#include "wine/test.h" + +#define NS_MAXDNAME 1025 + +static void test_DnsQuery(void) +{ + WCHAR domain[MAX_PATH]; + WCHAR name[NS_MAXDNAME]; + DWORD ret, size; + DNS_RECORDW *rec; + DNS_STATUS status; + + wcscpy(domain, L"_ldap._tcp.deadbeef"); + status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, "got %u\n", status); + + wcscpy(domain, L"_ldap._tcp.dc._msdcs."); + size = ARRAY_SIZE(domain) - wcslen(domain); + ret = GetComputerNameExW(ComputerNameDnsDomain, domain + wcslen(domain), &size); + ok(ret, "GetComputerNameEx error %u\n", GetLastError()); + if (!size) + { + skip("computer is not in a domain\n"); + return; + } + + status = DnsQuery_W(domain, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); + trace("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(domain), status); + if (status != ERROR_SUCCESS) + { + skip("domain %s doesn't have an SRV entry\n", wine_dbgstr_w(domain)); + return; + } + + trace("target %s, port %d\n", wine_dbgstr_w(rec->Data.Srv.pNameTarget), rec->Data.Srv.wPort); + + wcsncpy(name, rec->Data.Srv.pNameTarget, ARRAY_SIZE(name)); + DnsRecordListFree(rec, DnsFreeRecordList); + + /* IPv4 */ + status = DnsQuery_W(name, DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == ERROR_SUCCESS || status == DNS_ERROR_RCODE_NAME_ERROR, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + if (status == ERROR_SUCCESS) + { + SOCKADDR_IN addr; + WCHAR buf[IP4_ADDRESS_STRING_LENGTH]; + + addr.sin_family = AF_INET; + addr.sin_port = 0; + addr.sin_addr.s_addr = rec->Data.A.IpAddress; + size = sizeof(buf); + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, buf, &size); + ok(!ret, "WSAAddressToStringW error %d\n", ret); + trace("WSAAddressToStringW => %s\n", wine_dbgstr_w(buf)); + + DnsRecordListFree(rec, DnsFreeRecordList); + } + + /* IPv6 */ + status = DnsQuery_W(name, DNS_TYPE_AAAA, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == ERROR_SUCCESS || status == DNS_ERROR_RCODE_NAME_ERROR, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + if (status == ERROR_SUCCESS) + { + SOCKADDR_IN6 addr; + WCHAR buf[IP6_ADDRESS_STRING_LENGTH]; + + addr.sin6_family = AF_INET6; + addr.sin6_port = 0; + addr.sin6_scope_id = 0; + memcpy(addr.sin6_addr.s6_addr, &rec->Data.AAAA.Ip6Address, sizeof(rec->Data.AAAA.Ip6Address)); + size = sizeof(buf); + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, buf, &size); + ok(!ret, "WSAAddressToStringW error %d\n", ret); + trace("WSAAddressToStringW => %s\n", wine_dbgstr_w(buf)); + + DnsRecordListFree(rec, DnsFreeRecordList); + } +} + +START_TEST(query) +{ + WSADATA data; + + WSAStartup(MAKEWORD(2, 2), &data); + + test_DnsQuery(); +}

1 0

Matteo Bruni : d3d8: Range-check GetPixelShaderConstant() indices to the d3d8 limit.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 9d764892ee713a689402a515e5e723a6a5b94ab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d764892ee713a689402a515… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 6 12:33:15 2020 +0100 d3d8: Range-check GetPixelShaderConstant() indices to the d3d8 limit. 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> --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index f67841b4b1..488035c7f8 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -40,6 +40,7 @@ #define D3DPRESENTFLAGS_MASK 0x00000fffu #define D3D8_MAX_VERTEX_SHADER_CONSTANTF 256 +#define D3D8_MAX_PIXEL_SHADER_CONSTANTF 8 #define D3D8_MAX_STREAMS 16 #define D3DFMT_RESZ MAKEFOURCC('R','E','S','Z') diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 45b158314e..d6253a4a2b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3295,7 +3295,8 @@ static HRESULT WINAPI d3d8_device_GetPixelShaderConstant(IDirect3DDevice8 *iface TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); - if (!constants || start_idx >= WINED3D_MAX_PS_CONSTS_F || count > WINED3D_MAX_PS_CONSTS_F - start_idx) + if (!constants || start_idx >= D3D8_MAX_PIXEL_SHADER_CONSTANTF + || count > D3D8_MAX_PIXEL_SHADER_CONSTANTF - start_idx) return WINED3DERR_INVALIDCALL; wined3d_mutex_lock();

1 0

Matteo Bruni : d3d8: Store primary stateblock state pointer in the device.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 417c36ccb7bdc78d3a98035d0bf420c5c1c4669a URL: https://source.winehq.org/git/wine.git/?a=commit;h=417c36ccb7bdc78d3a98035d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 6 12:33:14 2020 +0100 d3d8: Store primary stateblock state pointer in the device. 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> --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 45 +++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=417c36ccb7bdc78d3a98…

1 0

Matteo Bruni : d3d9: Retrieve state from the stateblock in d3d9_stateblock_Apply().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: acaf1204e0892eb5b97078472446d4db6de53887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acaf1204e0892eb5b9707847… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 6 12:33:13 2020 +0100 d3d9: Retrieve state from the stateblock in d3d9_stateblock_Apply(). 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> --- dlls/d3d9/stateblock.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index a1ce3d5856..3c1e323009 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -118,11 +118,9 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) struct wined3d_texture *wined3d_texture; struct wined3d_buffer *wined3d_buffer; struct d3d9_vertexbuffer *buffer; - unsigned int i, offset, stride; - enum wined3d_format_id format; struct d3d9_texture *texture; struct d3d9_device *device; - HRESULT hr; + unsigned int i; TRACE("iface %p.\n", iface); @@ -138,15 +136,14 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) device->sysmem_vb = 0; for (i = 0; i < D3D9_MAX_STREAMS; ++i) { - if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, - i, &wined3d_buffer, &offset, &stride))) + if (!(wined3d_buffer = device->stateblock_state->streams[i].buffer)) continue; - if (!wined3d_buffer || !(buffer = wined3d_buffer_get_parent(wined3d_buffer))) + if (!(buffer = wined3d_buffer_get_parent(wined3d_buffer))) continue; if (buffer->draw_buffer) device->sysmem_vb |= 1u << i; } - device->sysmem_ib = (wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset)) + device->sysmem_ib = (wined3d_buffer = device->stateblock_state->index_buffer) && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; device->auto_mipmaps = 0; for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i)

1 0

Matteo Bruni : d3d9: Store primary stateblock state pointer in the device.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: a9125eed376bf7ea2370ebe5560684d290a95211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9125eed376bf7ea2370ebe5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 6 12:33:12 2020 +0100 d3d9: Store primary stateblock state pointer in the device. 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> --- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 66 +++++++++++++++++++++++------------------------- dlls/d3d9/stateblock.c | 2 +- 3 files changed, 34 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9125eed376bf7ea2370…

1 0

Zebediah Figura : wined3d: Move the depth bias scale to wined3d_rasterizer_state.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: bdb2ead58d4282ecb9f65d558347730c4d45f6ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdb2ead58d4282ecb9f65d55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 19:28:11 2020 -0600 wined3d: Move the depth bias scale to wined3d_rasterizer_state. 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/d3d11/device.c | 5 +---- dlls/d3d11/state.c | 3 ++- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/state.c | 14 +++++++------- include/wine/wined3d.h | 1 + 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 63d7f1dc2b..0e46816246 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -933,7 +933,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon { DWORD d; float f; - } scale_bias, const_bias; + } const_bias; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); @@ -941,7 +941,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); @@ -953,9 +952,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_device_set_rasterizer_state(device->wined3d_device, rasterizer_state_impl->wined3d_state); desc = &rasterizer_state_impl->desc; - scale_bias.f = desc->SlopeScaledDepthBias; const_bias.f = desc->DepthBias; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, const_bias.d); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 47d42fd6c5..4d56f7dc75 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1079,8 +1079,9 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.fill_mode = desc->FillMode; wined3d_desc.cull_mode = desc->CullMode; wined3d_desc.front_ccw = desc->FrontCounterClockwise; - wined3d_desc.depth_clip = desc->DepthClipEnable; wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; + wined3d_desc.scale_bias = desc->SlopeScaledDepthBias; + wined3d_desc.depth_clip = desc->DepthClipEnable; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34482d8ea2..03c32ec6f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3600,6 +3600,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_FILLMODE: case WINED3D_RS_CULLMODE: + case WINED3D_RS_SLOPESCALEDEPTHBIAS: set_rasterizer_state = TRUE; break; @@ -3615,11 +3616,18 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_rasterizer_state *rasterizer_state; struct wined3d_rasterizer_state_desc desc; struct wine_rb_entry *entry; + union + { + DWORD d; + float f; + } bias; desc.fill_mode = state->rs[WINED3D_RS_FILLMODE]; desc.cull_mode = state->rs[WINED3D_RS_CULLMODE]; desc.front_ccw = FALSE; desc.depth_bias_clamp = 0.0f; + bias.d = state->rs[WINED3D_RS_SLOPESCALEDEPTHBIAS]; + desc.scale_bias = bias.f; desc.depth_clip = TRUE; if ((entry = wine_rb_get(&device->rasterizer_states, &desc))) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5cf425f0a5..85bd1e24a3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1755,9 +1755,10 @@ static void state_scissor(struct wined3d_context *context, const struct wined3d_ static void state_depthbias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + const struct wined3d_rasterizer_state *r = state->rasterizer_state; + float scale_bias = r ? r->desc.scale_bias : 0.0f; - if (state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS] - || state->render_states[WINED3D_RS_DEPTHBIAS]) + if (scale_bias || state->render_states[WINED3D_RS_DEPTHBIAS]) { const struct wined3d_rendertarget_view *depth = state->fb->depth_stencil; float factor, units, scale, clamp; @@ -1766,10 +1767,9 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 { DWORD d; float f; - } scale_bias, const_bias; + } const_bias; - clamp = state->rasterizer_state ? state->rasterizer_state->desc.depth_bias_clamp : 0.0f; - scale_bias.d = state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS]; + clamp = r ? r->desc.depth_bias_clamp : 0.0f; const_bias.d = state->render_states[WINED3D_RS_DEPTHBIAS]; if (context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_DEPTH_BIAS) @@ -1792,7 +1792,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 scale = 0.0f; } - factor = scale_bias.f; + factor = scale_bias; units = const_bias.f * scale; } @@ -4663,7 +4663,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop }, WINED3D_GL_BLEND_EQUATION }, { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), state_scissor }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SLOPESCALEDEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), state_colorwrite1 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), state_colorwrite2 }, EXT_DRAW_BUFFERS2 }, @@ -5436,6 +5435,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 61, 127}, {149, 150}, {169, 169}, + {175, 175}, {177, 177}, {193, 193}, {196, 197}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bfdd1b9ca3..3b7b837d3e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2037,6 +2037,7 @@ struct wined3d_rasterizer_state_desc enum wined3d_cull cull_mode; BOOL front_ccw; float depth_bias_clamp; + float scale_bias; BOOL depth_clip; };

1 0

Zebediah Figura : wined3d: Move the cull mode to wined3d_rasterizer_state.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 6045fe027b861f109ac4b6c40cdd7f51929218e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6045fe027b861f109ac4b6c4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 19:28:10 2020 -0600 wined3d: Move the cull mode to wined3d_rasterizer_state. 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/d3d11/device.c | 2 -- dlls/d3d11/state.c | 1 + dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 ++ dlls/wined3d/state.c | 14 +++++++------- include/wine/wined3d.h | 1 + 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4c42fa284c..63d7f1dc2b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -941,7 +941,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_BACK); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); @@ -954,7 +953,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_device_set_rasterizer_state(device->wined3d_device, rasterizer_state_impl->wined3d_state); desc = &rasterizer_state_impl->desc; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); scale_bias.f = desc->SlopeScaledDepthBias; const_bias.f = desc->DepthBias; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index d63a1bc699..47d42fd6c5 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1077,6 +1077,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str } wined3d_desc.fill_mode = desc->FillMode; + wined3d_desc.cull_mode = desc->CullMode; wined3d_desc.front_ccw = desc->FrontCounterClockwise; wined3d_desc.depth_clip = desc->DepthClipEnable; wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index af2b00f88e..28e0d262a5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3150,7 +3150,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, gl_info->gl_ops.gl.p_glDisable(GL_BLEND); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CULLMODE)); + context_invalidate_state(context, STATE_RASTERIZER); gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_STENCILENABLE)); gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 69ff7dd0cd..34482d8ea2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3599,6 +3599,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, break; case WINED3D_RS_FILLMODE: + case WINED3D_RS_CULLMODE: set_rasterizer_state = TRUE; break; @@ -3616,6 +3617,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wine_rb_entry *entry; desc.fill_mode = state->rs[WINED3D_RS_FILLMODE]; + desc.cull_mode = state->rs[WINED3D_RS_CULLMODE]; desc.front_ccw = FALSE; desc.depth_bias_clamp = 0.0f; desc.depth_clip = TRUE; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 388116bc66..5cf425f0a5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -255,13 +255,13 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ context_apply_state(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); } -static void state_cullmode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void cullmode(const struct wined3d_rasterizer_state *r, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + enum wined3d_cull mode = r ? r->desc.cull_mode : WINED3D_CULL_BACK; /* glFrontFace() is set in context.c at context init and on an * offscreen / onscreen rendering switch. */ - switch (state->render_states[WINED3D_RS_CULLMODE]) + switch (mode) { case WINED3D_CULL_NONE: gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE); @@ -280,8 +280,7 @@ static void state_cullmode(struct wined3d_context *context, const struct wined3d checkGLcall("glCullFace(GL_BACK)"); break; default: - FIXME("Unrecognized cull mode %#x.\n", - state->render_states[WINED3D_RS_CULLMODE]); + FIXME("Unrecognized cull mode %#x.\n", mode); } } @@ -4335,6 +4334,7 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); fillmode(r, gl_info); + cullmode(r, gl_info); depth_clip(r, gl_info); } @@ -4351,6 +4351,7 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); fillmode(r, gl_info); + cullmode(r, gl_info); depth_clip(r, gl_info); } @@ -4598,7 +4599,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), state_zwriteenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_CULLMODE), { STATE_RENDER(WINED3D_RS_CULLMODE), state_cullmode }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZFUNC), { STATE_RENDER(WINED3D_RS_ZFUNC), state_zfunc }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SUBPIXEL), { STATE_RENDER(WINED3D_RS_SUBPIXEL), state_subpixel }, WINED3D_GL_EXT_NONE }, @@ -5430,7 +5430,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 3, 3}, { 8, 8}, { 17, 18}, - { 21, 21}, + { 21, 22}, { 42, 45}, { 47, 47}, { 61, 127}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2370ca469f..bfdd1b9ca3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2034,6 +2034,7 @@ struct wined3d_blend_state_desc struct wined3d_rasterizer_state_desc { enum wined3d_fill_mode fill_mode; + enum wined3d_cull cull_mode; BOOL front_ccw; float depth_bias_clamp; BOOL depth_clip;

1 0

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 March 2020