March 2020 - Wine-Devel - list.winehq.org

[PATCH v2 5/5] wined3d: Refactor wined3d_find_closest_matching_adapter_mode() to wined3d_output_find_closest_matching_mode().
by Zhiyi Zhang March 6, 2020

March 6, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/output.c | 7 +------ dlls/dxgi/swapchain.c | 9 ++------- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 17 ++++++++--------- dlls/wined3d/swapchain.c | 23 ++++++++++------------- dlls/wined3d/wined3d.spec | 6 +++--- dlls/wined3d/wined3d_main.c | 4 ++-- include/wine/wined3d.h | 11 +++++------ 8 files changed, 32 insertions(+), 47 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index fe8dd7b5c0a..8c94788fbf1 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -49,8 +49,6 @@ static void dxgi_mode1_from_wined3d(DXGI_MODE_DESC1 *mode, const struct wined3d_ static HRESULT dxgi_output_find_closest_matching_mode(struct dxgi_output *output, struct wined3d_display_mode *mode, IUnknown *device) { - struct dxgi_adapter *adapter; - struct wined3d *wined3d; HRESULT hr; if (!mode->width != !mode->height) @@ -66,10 +64,7 @@ static HRESULT dxgi_output_find_closest_matching_mode(struct dxgi_output *output } wined3d_mutex_lock(); - adapter = output->adapter; - wined3d = adapter->factory->wined3d; - - hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter->ordinal, mode); + hr = wined3d_output_find_closest_matching_mode(output->wined3d_output, mode); wined3d_mutex_unlock(); return hr; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0d929099eb9..b86a79a94cf 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -156,15 +156,13 @@ static HRESULT dxgi_swapchain_set_fullscreen_state(struct wined3d_swapchain_stat const struct wined3d_swapchain_desc *swapchain_desc, IDXGIOutput *output) { struct dxgi_output *dxgi_output; - struct dxgi_adapter *adapter; HRESULT hr; dxgi_output = unsafe_impl_from_IDXGIOutput(output); - adapter = dxgi_output->adapter; wined3d_mutex_lock(); hr = wined3d_swapchain_state_set_fullscreen(state, swapchain_desc, - adapter->factory->wined3d, dxgi_output->wined3d_output, NULL); + dxgi_output->wined3d_output, NULL); wined3d_mutex_unlock(); return hr; @@ -175,7 +173,6 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, { struct wined3d_display_mode mode; struct dxgi_output *dxgi_output; - struct dxgi_adapter *adapter; IDXGIOutput *output; HRESULT hr; @@ -188,7 +185,6 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(swapchain, &output))) return hr; dxgi_output = unsafe_impl_from_IDXGIOutput(output); - adapter = dxgi_output->adapter; TRACE("Mode: %s.\n", debug_dxgi_mode(target_mode_desc)); @@ -197,8 +193,7 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, wined3d_display_mode_from_dxgi(&mode, target_mode_desc); - hr = wined3d_swapchain_state_resize_target(state, adapter->factory->wined3d, - dxgi_output->wined3d_output, &mode); + hr = wined3d_swapchain_state_resize_target(state, dxgi_output->wined3d_output, &mode); IDXGIOutput_Release(output); return hr; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9a1a16a6a7b..370ec5b794b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5154,7 +5154,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, return E_FAIL; } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, - swapchain_desc, device->wined3d, output, mode))) + swapchain_desc, output, mode))) return hr; /* Switch from fullscreen to windowed. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6ab9dd23579..9ca3053c89b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1080,18 +1080,18 @@ HRESULT CDECL wined3d_output_get_mode(const struct wined3d_output *output, return WINED3D_OK; } -HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, - unsigned int adapter_idx, struct wined3d_display_mode *mode) +HRESULT CDECL wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, + struct wined3d_display_mode *mode) { unsigned int i, j, mode_count, matching_mode_count, closest; struct wined3d_display_mode **matching_modes; struct wined3d_display_mode *modes; HRESULT hr; - TRACE("wined3d %p, adapter_idx %u, mode %p.\n", wined3d, adapter_idx, mode); + TRACE("output %p, mode %p.\n", output, mode); - if (!(mode_count = wined3d_output_get_mode_count(&wined3d->adapters[adapter_idx]->outputs[0], - mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN))) + if (!(mode_count = wined3d_output_get_mode_count(output, mode->format_id, + WINED3D_SCANLINE_ORDERING_UNKNOWN))) { WARN("Output has 0 matching modes.\n"); return E_FAIL; @@ -1107,8 +1107,8 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w for (i = 0; i < mode_count; ++i) { - if (FAILED(hr = wined3d_output_get_mode(&wined3d->adapters[adapter_idx]->outputs[0], - mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &modes[i]))) + if (FAILED(hr = wined3d_output_get_mode(output, mode->format_id, + WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &modes[i]))) { heap_free(matching_modes); heap_free(modes); @@ -1144,8 +1144,7 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w if (!mode->width || !mode->height) { struct wined3d_display_mode current_mode; - if (FAILED(hr = wined3d_output_get_display_mode(&wined3d->adapters[adapter_idx]->outputs[0], - &current_mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(output, &current_mode, NULL))) { heap_free(matching_modes); heap_free(modes); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 57e5e25003a..c0eb25ffb66 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1440,13 +1440,13 @@ 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, struct wined3d_output *output, struct wined3d_display_mode *mode) + 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, 0, mode))) + if (FAILED(hr = wined3d_output_find_closest_matching_mode(output, mode))) { WARN("Failed to find closest matching mode, hr %#x.\n", hr); } @@ -1462,15 +1462,14 @@ 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, struct wined3d_output *output, - const struct wined3d_display_mode *mode) + 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, output %p, mode %p.\n", state, wined3d, output, mode); + TRACE("state %p, output %p, mode %p.\n", state, output, mode); wined3d_mutex_lock(); @@ -1490,8 +1489,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, output, - &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) { wined3d_mutex_unlock(); return hr; @@ -1628,14 +1626,14 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st } HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *swapchain_desc, struct wined3d *wined3d, - struct wined3d_output *output, const struct wined3d_display_mode *mode) + const struct wined3d_swapchain_desc *swapchain_desc, struct wined3d_output *output, + const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; HRESULT hr; - TRACE("state %p, swapchain_desc %p, wined3d %p, output %p, mode %p.\n", - state, swapchain_desc, wined3d, output, mode); + TRACE("state %p, swapchain_desc %p, output %p, mode %p.\n", + state, swapchain_desc, output, mode); if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { @@ -1660,8 +1658,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st } } - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output, - &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) return hr; } else diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 01f261b7662..51745e24183 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -9,7 +9,6 @@ @ cdecl wined3d_check_device_type(ptr long long long long long) @ cdecl wined3d_create(long) @ cdecl wined3d_decref(ptr) -@ cdecl wined3d_find_closest_matching_adapter_mode(ptr long ptr) @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) @@ -158,6 +157,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) @ cdecl wined3d_output_get_display_mode(ptr ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_get_mode_count(ptr long long) @@ -282,8 +282,8 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) -@ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr ptr) -@ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr ptr) +@ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr) +@ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) @ cdecl wined3d_texture_blt(ptr long ptr ptr long ptr long ptr long) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index ea58f4473b8..e681ac1b61b 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -570,8 +570,8 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam ERR("Failed to get output from swapchain %p.\n", swapchain); break; } - wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, - swapchain->device->wined3d, output, NULL); + wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, output, + NULL); wined3d_wndproc_mutex_unlock(); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b2b7dac87c2..a3a66fd4219 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2258,8 +2258,6 @@ HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT ad enum wined3d_format_id backbuffer_format_id, BOOL windowed); struct wined3d * __cdecl wined3d_create(DWORD flags); ULONG __cdecl wined3d_decref(struct wined3d *wined3d); -HRESULT __cdecl wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, - unsigned int adapter_idx, struct wined3d_display_mode *mode); struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d, unsigned int idx); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); @@ -2492,6 +2490,8 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, + struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_output_get_display_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, @@ -2759,11 +2759,10 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de HWND window, struct wined3d *wined3d, 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, 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); +HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, + const struct wined3d_swapchain_desc *desc, struct wined3d_output *output, + const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); -- 2.20.1

2 1

[PATCH v2 4/5] wined3d: Refactor wined3d_get_adapter_display_mode() to wined3d_output_get_display_mode().
by Zhiyi Zhang March 6, 2020

March 6, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 7 ++++++- dlls/d3d9/directx.c | 14 ++++++++++++-- dlls/ddraw/ddraw.c | 12 ++++++------ dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/surface.c | 2 +- dlls/dxgi/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 25 +++++++++++-------------- dlls/wined3d/swapchain.c | 31 ++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 4 ++-- include/wine/wined3d.h | 6 +++--- 11 files changed, 63 insertions(+), 50 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index b78b119d22c..d515caffd25 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -184,13 +184,18 @@ static HRESULT WINAPI d3d8_GetAdapterDisplayMode(IDirect3D8 *iface, UINT adapter { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); struct wined3d_display_mode wined3d_mode; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, mode %p.\n", iface, adapter, mode); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); - hr = wined3d_get_adapter_display_mode(d3d8->wined3d, adapter, &wined3d_mode, NULL); + hr = wined3d_output_get_display_mode(d3d8->wined3d_outputs[output_idx], &wined3d_mode, NULL); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 83bb3d8217c..d006cf27435 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -208,12 +208,17 @@ static HRESULT WINAPI d3d9_GetAdapterDisplayMode(IDirect3D9Ex *iface, UINT adapt { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); struct wined3d_display_mode wined3d_mode; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, mode %p.\n", iface, adapter, mode); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); - hr = wined3d_get_adapter_display_mode(d3d9->wined3d, adapter, &wined3d_mode, NULL); + hr = wined3d_output_get_display_mode(d3d9->wined3d_outputs[output_idx], &wined3d_mode, NULL); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) @@ -504,16 +509,21 @@ static HRESULT WINAPI d3d9_GetAdapterDisplayModeEx(IDirect3D9Ex *iface, { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); struct wined3d_display_mode wined3d_mode; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, mode %p, rotation %p.\n", iface, adapter, mode, rotation); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (mode->Size != sizeof(*mode)) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_get_adapter_display_mode(d3d9->wined3d, adapter, &wined3d_mode, + hr = wined3d_output_get_display_mode(d3d9->wined3d_outputs[output_idx], &wined3d_mode, (enum wined3d_display_rotation *)rotation); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 4d4a9d7114f..f947ca8b2b6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -556,7 +556,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, TRACE("ddraw %p.\n", ddraw); - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) { ERR("Failed to get display mode.\n"); return hr; @@ -1617,7 +1617,7 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 wined3d_mutex_lock(); - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); @@ -1710,7 +1710,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes TRACE("iface %p, codes_count %p, codes %p.\n", iface, NumCodes, Codes); - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return hr; @@ -1772,7 +1772,7 @@ static HRESULT WINAPI ddraw7_GetMonitorFrequency(IDirectDraw7 *iface, DWORD *fre TRACE("iface %p, frequency %p.\n", iface, frequency); wined3d_mutex_lock(); - hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL); + hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -1907,7 +1907,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *c /* Some applications (e.g. 3DMark 2000) assume that the reported amount of * video memory doesn't include the memory used by the default framebuffer. */ - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) { WARN("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); @@ -4432,7 +4432,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device * not like that we'll have to find some workaround, like iterating over * all imaginable formats and collecting all the depth stencil formats we * can get. */ - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 39626157a56..ab3584b8fea 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1086,10 +1086,10 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, wined3d_mutex_lock(); memset(&mode, 0, sizeof(mode)); - if (FAILED(hr = wined3d_get_adapter_display_mode(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(device->ddraw->wined3d_output, &mode, NULL))) { wined3d_mutex_unlock(); - WARN("Cannot get the current adapter format\n"); + WARN("Failed to get output display mode, hr %#x.\n", hr); return hr; } @@ -1214,10 +1214,10 @@ static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface, wined3d_mutex_lock(); memset(&mode, 0, sizeof(mode)); - if (FAILED(hr = wined3d_get_adapter_display_mode(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(device->ddraw->wined3d_output, &mode, NULL))) { wined3d_mutex_unlock(); - WARN("Cannot get the current adapter format\n"); + WARN("Failed to get output display mode, hr %#x.\n", hr); return hr; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 442aeed67b3..a803324c450 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6008,7 +6008,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); heap_free(texture); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 25e994c5fe8..0d929099eb9 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2903,7 +2903,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, window, swapchain_desc, fullscreen_desc))) return hr; if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, - dxgi_adapter->factory->wined3d, dxgi_adapter->ordinal, &swapchain->state))) + dxgi_adapter->factory->wined3d, &swapchain->state))) return hr; if (swapchain_desc->BufferUsage && swapchain_desc->BufferUsage != DXGI_USAGE_RENDER_TARGET_OUTPUT) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 21f9af9566d..9a1a16a6a7b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4856,7 +4856,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(&device->adapter->outputs[0], &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fb43e46ee5e..6ab9dd23579 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -933,7 +933,7 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in if (!(monitor = MonitorFromPoint(adapter->monitor_position, MONITOR_DEFAULTTOPRIMARY))) return WINED3DERR_INVALIDCALL; - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode, &rotation))) + if (FAILED(hr = wined3d_output_get_display_mode(&adapter->outputs[0], &mode, &rotation))) return hr; memcpy(desc->device_name, adapter->device_name, sizeof(desc->device_name)); @@ -1144,7 +1144,7 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w if (!mode->width || !mode->height) { struct wined3d_display_mode current_mode; - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, + if (FAILED(hr = wined3d_output_get_display_mode(&wined3d->adapters[adapter_idx]->outputs[0], &current_mode, NULL))) { heap_free(matching_modes); @@ -1180,24 +1180,20 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w return WINED3D_OK; } -HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, +HRESULT CDECL wined3d_output_get_display_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation) { - const struct wined3d_adapter *adapter; DEVMODEW m; - TRACE("wined3d %p, adapter_idx %u, display_mode %p, rotation %p.\n", - wined3d, adapter_idx, mode, rotation); + TRACE("output %p, display_mode %p, rotation %p.\n", output, mode, rotation); - if (!mode || adapter_idx >= wined3d->adapter_count) + if (!mode) return WINED3DERR_INVALIDCALL; - adapter = wined3d->adapters[adapter_idx]; - memset(&m, 0, sizeof(m)); m.dmSize = sizeof(m); - EnumDisplaySettingsExW(adapter->device_name, ENUM_CURRENT_SETTINGS, &m, 0); + EnumDisplaySettingsExW(output->device_name, ENUM_CURRENT_SETTINGS, &m, 0); mode->width = m.dmPelsWidth; mode->height = m.dmPelsHeight; mode->refresh_rate = DEFAULT_REFRESH_RATE; @@ -1209,12 +1205,12 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI * are pretty angry if they SetDisplayMode from 24 to 16 bpp and find out * that GetDisplayMode still returns 24 bpp. This should probably be * handled in winex11 instead. */ - if (adapter->outputs[0].screen_format && adapter->outputs[0].screen_format != mode->format_id) + if (output->screen_format && output->screen_format != mode->format_id) { WARN("Overriding format %s with stored format %s.\n", debug_d3dformat(mode->format_id), - debug_d3dformat(adapter->outputs[0].screen_format)); - mode->format_id = adapter->outputs[0].screen_format; + debug_d3dformat(output->screen_format)); + mode->format_id = output->screen_format; } if (!(m.dmFields & DM_DISPLAYFLAGS)) @@ -1421,7 +1417,8 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U if (!QueryPerformanceCounter(&counter) || !QueryPerformanceFrequency(&freq_per_sec)) return WINED3DERR_INVALIDCALL; - if (FAILED(wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode, NULL))) + if (FAILED(wined3d_output_get_display_mode(&wined3d->adapters[adapter_idx]->outputs[0], &mode, + NULL))) return WINED3DERR_INVALIDCALL; if (mode.refresh_rate == DEFAULT_REFRESH_RATE) mode.refresh_rate = 60; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 24519f076ee..57e5e25003a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -321,12 +321,18 @@ struct wined3d_swapchain_state * CDECL wined3d_swapchain_get_state(struct wined3 HRESULT CDECL wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation) { + struct wined3d_output *output; HRESULT hr; TRACE("swapchain %p, mode %p, rotation %p.\n", swapchain, mode, rotation); - hr = wined3d_get_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, mode, rotation); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } + + hr = wined3d_output_get_display_mode(output, mode, rotation); TRACE("Returning w %u, h %u, refresh rate %u, format %s.\n", mode->width, mode->height, mode->refresh_rate, debug_d3dformat(mode->format_id)); @@ -811,8 +817,7 @@ static enum wined3d_format_id adapter_format_from_backbuffer_format(const struct } static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *desc, HWND window, - struct wined3d *wined3d, unsigned int adapter_idx) + const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d *wined3d) { struct wined3d_output *output; HRESULT hr; @@ -825,7 +830,7 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat return E_FAIL; } - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &state->original_mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(output, &state->original_mode, NULL))) { ERR("Failed to get current display mode, hr %#x.\n", hr); return hr; @@ -858,7 +863,6 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_swapchain_ops *swapchain_ops) { - const struct wined3d_adapter *adapter = device->adapter; struct wined3d_resource_desc texture_desc; struct wined3d_output *output; BOOL displaymode_set = FALSE; @@ -882,7 +886,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); window = desc->device_window ? desc->device_window : device->create_parms.focus_window; - if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d, adapter->ordinal))) + if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d))) return hr; swapchain->swapchain_ops = swapchain_ops; @@ -1496,7 +1500,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta } else { - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, 0, &actual_mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(output, &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); @@ -1665,7 +1669,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st if (mode) WARN("WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH is not set, ignoring mode.\n"); - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, 0, &actual_mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(output, &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; @@ -1716,20 +1720,17 @@ void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state } HRESULT CDECL wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_swapchain_state **state) + HWND window, struct wined3d *wined3d, struct wined3d_swapchain_state **state) { struct wined3d_swapchain_state *s; HRESULT hr; - TRACE("desc %p, window %p, wined3d %p, adapter_idx %u, state %p.\n", - desc, window, wined3d, adapter_idx, state); - - TRACE("desc %p, window %p, state %p.\n", desc, window, state); + TRACE("desc %p, window %p, wined3d %p, state %p.\n", desc, window, wined3d, state); if (!(s = heap_alloc_zero(sizeof(*s)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d, adapter_idx))) + if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d))) { heap_free(s); return hr; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b83adbaa8f3..01f261b7662 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -12,7 +12,6 @@ @ cdecl wined3d_find_closest_matching_adapter_mode(ptr long ptr) @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) -@ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) @ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @@ -159,6 +158,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_output_get_display_mode(ptr ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_get_mode_count(ptr long long) @ cdecl wined3d_output_set_display_mode(ptr ptr) @@ -280,7 +280,7 @@ @ cdecl wined3d_swapchain_set_palette(ptr ptr) @ cdecl wined3d_swapchain_set_window(ptr ptr) -@ cdecl wined3d_swapchain_state_create(ptr ptr ptr long ptr) +@ cdecl wined3d_swapchain_state_create(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f62375e539e..b2b7dac87c2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2263,8 +2263,6 @@ HRESULT __cdecl wined3d_find_closest_matching_adapter_mode(const struct wined3d struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d, unsigned int idx); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); -HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, - struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier); HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, @@ -2494,6 +2492,8 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +HRESULT __cdecl wined3d_output_get_display_mode(const struct wined3d_output *output, + struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, unsigned int mode_idx, struct wined3d_display_mode *mode); @@ -2756,7 +2756,7 @@ void __cdecl wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, - HWND window, struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_swapchain_state **state); + HWND window, struct wined3d *wined3d, 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, struct wined3d_output *output, -- 2.20.1

2 1

[PATCH v2 3/5] wined3d: Refactor wined3d_set_adapter_display_mode() to wined3d_output_set_display_mode().
by Zhiyi Zhang March 6, 2020

March 6, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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 --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9f51cd2ca6f..4d4a9d7114f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -683,7 +683,7 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) return DDERR_NOEXCLUSIVEMODE; } - if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, NULL))) + if (SUCCEEDED(hr = wined3d_output_set_display_mode(ddraw->wined3d_output, NULL))) ddraw->flags &= ~DDRAW_RESTORE_MODE; InterlockedCompareExchange(&ddraw->device_state, DDRAW_DEVICE_STATE_NOT_RESTORED, DDRAW_DEVICE_STATE_OK); @@ -1104,7 +1104,7 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW /* TODO: The possible return values from msdn suggest that the screen mode * can't be changed if a surface is locked or some drawing is in progress. */ - if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) + if (SUCCEEDED(hr = wined3d_output_set_display_mode(ddraw->wined3d_output, &mode))) { if (ddraw->primary) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f873ed56b2a..fb43e46ee5e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1209,12 +1209,12 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI * are pretty angry if they SetDisplayMode from 24 to 16 bpp and find out * that GetDisplayMode still returns 24 bpp. This should probably be * handled in winex11 instead. */ - if (adapter->screen_format && adapter->screen_format != mode->format_id) + if (adapter->outputs[0].screen_format && adapter->outputs[0].screen_format != mode->format_id) { WARN("Overriding format %s with stored format %s.\n", debug_d3dformat(mode->format_id), - debug_d3dformat(adapter->screen_format)); - mode->format_id = adapter->screen_format; + debug_d3dformat(adapter->outputs[0].screen_format)); + mode->format_id = adapter->outputs[0].screen_format; } if (!(m.dmFields & DM_DISPLAYFLAGS)) @@ -1253,20 +1253,15 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI return WINED3D_OK; } -HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, - UINT adapter_idx, const struct wined3d_display_mode *mode) +HRESULT CDECL wined3d_output_set_display_mode(struct wined3d_output *output, + const struct wined3d_display_mode *mode) { - struct wined3d_adapter *adapter; DEVMODEW new_mode, current_mode; RECT clip_rc; LONG ret; enum wined3d_format_id new_format_id; - TRACE("wined3d %p, adapter_idx %u, mode %p.\n", wined3d, adapter_idx, mode); - - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - adapter = wined3d->adapters[adapter_idx]; + TRACE("output %p, mode %p.\n", output, mode); memset(&new_mode, 0, sizeof(new_mode)); new_mode.dmSize = sizeof(new_mode); @@ -1279,7 +1274,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, TRACE("mode %ux%u@%u %s %#x.\n", mode->width, mode->height, mode->refresh_rate, debug_d3dformat(mode->format_id), mode->scanline_ordering); - format = wined3d_get_format(adapter, mode->format_id, WINED3D_BIND_RENDER_TARGET); + format = wined3d_get_format(output->adapter, mode->format_id, WINED3D_BIND_RENDER_TARGET); new_mode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; new_mode.dmBitsPerPel = format->byte_count * CHAR_BIT; @@ -1300,7 +1295,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } else { - if (!EnumDisplaySettingsW(adapter->device_name, ENUM_REGISTRY_SETTINGS, &new_mode)) + if (!EnumDisplaySettingsW(output->device_name, ENUM_REGISTRY_SETTINGS, &new_mode)) { ERR("Failed to read mode from registry.\n"); return WINED3DERR_NOTAVAILABLE; @@ -1309,7 +1304,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } /* Only change the mode if necessary. */ - if (!EnumDisplaySettingsW(adapter->device_name, ENUM_CURRENT_SETTINGS, &current_mode)) + if (!EnumDisplaySettingsW(output->device_name, ENUM_CURRENT_SETTINGS, &current_mode)) { ERR("Failed to get current display mode.\n"); } @@ -1322,11 +1317,11 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, || !(new_mode.dmFields & DM_DISPLAYFLAGS))) { TRACE("Skipping redundant mode setting call.\n"); - adapter->screen_format = new_format_id; + output->screen_format = new_format_id; return WINED3D_OK; } - ret = ChangeDisplaySettingsExW(adapter->device_name, &new_mode, NULL, CDS_FULLSCREEN, NULL); + ret = ChangeDisplaySettingsExW(output->device_name, &new_mode, NULL, CDS_FULLSCREEN, NULL); if (ret != DISP_CHANGE_SUCCESSFUL) { if (new_mode.dmFields & DM_DISPLAYFREQUENCY) @@ -1334,14 +1329,14 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, WARN("ChangeDisplaySettingsExW failed, trying without the refresh rate.\n"); new_mode.dmFields &= ~DM_DISPLAYFREQUENCY; new_mode.dmDisplayFrequency = 0; - ret = ChangeDisplaySettingsExW(adapter->device_name, &new_mode, NULL, CDS_FULLSCREEN, NULL); + ret = ChangeDisplaySettingsExW(output->device_name, &new_mode, NULL, CDS_FULLSCREEN, NULL); } if (ret != DISP_CHANGE_SUCCESSFUL) return WINED3DERR_NOTAVAILABLE; } /* Store the new values. */ - adapter->screen_format = new_format_id; + output->screen_format = new_format_id; /* And finally clip mouse to our screen. */ SetRect(&clip_rc, 0, 0, new_mode.dmPelsWidth, new_mode.dmPelsHeight); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 65935a61650..24519f076ee 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -29,7 +29,8 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) { - HRESULT hr; + struct wined3d_output *output; + HRESULT hr = E_FAIL; UINT i; TRACE("Destroying swapchain %p.\n", swapchain); @@ -71,8 +72,9 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) { if (swapchain->state.desc.auto_restore_display_mode) { - if (FAILED(hr = wined3d_set_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, &swapchain->state.original_mode))) + output = wined3d_swapchain_get_output(swapchain); + if (!output || FAILED(hr = wined3d_output_set_display_mode(output, + &swapchain->state.original_mode))) ERR("Failed to restore display mode, hr %#x.\n", hr); if (swapchain->state.desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) @@ -858,6 +860,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc { const struct wined3d_adapter *adapter = device->adapter; struct wined3d_resource_desc texture_desc; + struct wined3d_output *output; BOOL displaymode_set = FALSE; DWORD texture_flags = 0; RECT client_rect; @@ -964,8 +967,9 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc if (!desc->windowed && desc->flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { /* Change the display settings */ - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, - adapter->ordinal, &swapchain->state.d3d_mode))) + output = wined3d_swapchain_get_output(swapchain); + if (!output || FAILED(hr = wined3d_output_set_display_mode(output, + &swapchain->state.d3d_mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); goto err; @@ -1048,8 +1052,8 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc err: if (displaymode_set) { - if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, - adapter->ordinal, &swapchain->state.original_mode))) + if (!output || FAILED(wined3d_output_set_display_mode(output, + &swapchain->state.original_mode))) ERR("Failed to restore display mode.\n"); ClipCursor(NULL); } @@ -1261,6 +1265,7 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa struct wined3d_device *device = swapchain->device; HWND window = swapchain->state.device_window; unsigned int screensaver_active; + struct wined3d_output *output; BOOL focus_messages, filter; /* This code is not protected by the wined3d mutex, so it may run while @@ -1292,8 +1297,9 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa if (device->wined3d->flags & WINED3D_RESTORE_MODE_ON_ACTIVATE) { - if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, - device->adapter->ordinal, &swapchain->state.d3d_mode))) + output = wined3d_swapchain_get_output(swapchain); + if (!output || FAILED(wined3d_output_set_display_mode(output, + &swapchain->state.d3d_mode))) ERR("Failed to set display mode.\n"); } @@ -1308,8 +1314,8 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa device->restore_screensaver = FALSE; } - if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, - device->adapter->ordinal, NULL))) + output = wined3d_swapchain_get_output(swapchain); + if (!output || FAILED(wined3d_output_set_display_mode(output, NULL))) ERR("Failed to set display mode.\n"); swapchain->reapply_mode = TRUE; @@ -1442,7 +1448,7 @@ static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain } } - if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, 0, mode))) + if (FAILED(hr = wined3d_output_set_display_mode(output, mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2dbb394444d..b83adbaa8f3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -20,7 +20,6 @@ @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) @ cdecl wined3d_register_window(ptr ptr ptr long) -@ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_unregister_windows(ptr) @ cdecl wined3d_adapter_get_output(ptr long) @@ -162,6 +161,7 @@ @ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_get_mode_count(ptr long long) +@ cdecl wined3d_output_set_display_mode(ptr ptr) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_take_ownership(ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23540295bb4..6e6634e4f48 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2900,6 +2900,7 @@ struct wined3d_output { WCHAR device_name[CCHDEVICENAME]; struct wined3d_adapter *adapter; + enum wined3d_format_id screen_format; D3DKMT_HANDLE kmt_adapter; D3DKMT_HANDLE kmt_device; @@ -2911,7 +2912,6 @@ struct wined3d_adapter { unsigned int ordinal; POINT monitor_position; - enum wined3d_format_id screen_format; struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b14db420838..f62375e539e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2277,8 +2277,6 @@ ULONG __cdecl wined3d_incref(struct wined3d *wined3d); HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function); BOOL __cdecl wined3d_register_window(struct wined3d *wined3d, HWND window, struct wined3d_device *device, unsigned int flags); -HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, - UINT adapter_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); struct wined3d_output * __cdecl wined3d_adapter_get_output(const struct wined3d_adapter *adapter, @@ -2502,6 +2500,8 @@ HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, unsigned int __cdecl wined3d_output_get_mode_count(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); +HRESULT __cdecl wined3d_output_set_display_mode(struct wined3d_output *output, + const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flags, -- 2.20.1

2 1

[PATCH v2 2/5] wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_display_mode().
by Zhiyi Zhang March 6, 2020

March 6, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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 312e8f2d24d..65935a61650 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 -- 2.20.1

2 1

[PATCH v2 1/5] wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_resize_target().
by Zhiyi Zhang March 6, 2020

March 6, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 180261,180265 and 180268~180270. Fixed a silly build error in 3/5. 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 603cf171e27..25e994c5fe8 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 be41cc385e7..312e8f2d24d 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 5c3efbdc8b6..2dbb394444d 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 cb8f19981aa..b14db420838 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2759,7 +2759,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); -- 2.20.1

2 1

[PATCH 1/5] d3d9: Store primary stateblock state pointer in the device.
by Matteo Bruni March 6, 2020

March 6, 2020

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- After this patch d3d9.dll's .text section shrinks by 150-200 bytes but, for some reason, .debug_info grows by ~16.5KB. I looked a bit at the generated code and there doesn't seem to be anything surprising. I guess this is okay... dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 66 +++++++++++++++++++--------------------- dlls/d3d9/stateblock.c | 2 +- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index a9f3f47596c..a21582d6e1e 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -122,6 +122,7 @@ struct d3d9_device struct wined3d_swapchain **implicit_swapchains; struct wined3d_stateblock *recording, *state, *update_state; + const struct wined3d_stateblock_state *stateblock_state; }; HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wined3d *wined3d, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a651a63f02e..8ffe04c94d7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1042,7 +1042,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (extended) { - const struct wined3d_viewport *current = &wined3d_stateblock_get_state(device->state)->viewport; + const struct wined3d_viewport *current = &device->stateblock_state->viewport; struct wined3d_viewport vp; RECT rect; @@ -2121,7 +2121,7 @@ static HRESULT WINAPI d3d9_device_GetTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - memcpy(matrix, &wined3d_stateblock_get_state(device->state)->transforms[state], sizeof(*matrix)); + memcpy(matrix, &device->stateblock_state->transforms[state], sizeof(*matrix)); wined3d_mutex_unlock(); return D3D_OK; @@ -2171,7 +2171,7 @@ static HRESULT WINAPI d3d9_device_GetViewport(IDirect3DDevice9Ex *iface, D3DVIEW TRACE("iface %p, viewport %p.\n", iface, viewport); wined3d_mutex_lock(); - wined3d_viewport = wined3d_stateblock_get_state(device->state)->viewport; + wined3d_viewport = device->stateblock_state->viewport; wined3d_mutex_unlock(); viewport->X = wined3d_viewport.x; @@ -2206,7 +2206,7 @@ static HRESULT WINAPI d3d9_device_GetMaterial(IDirect3DDevice9Ex *iface, D3DMATE /* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - memcpy(material, &wined3d_stateblock_get_state(device->state)->material, sizeof(*material)); + memcpy(material, &device->stateblock_state->material, sizeof(*material)); wined3d_mutex_unlock(); return D3D_OK; @@ -2297,7 +2297,7 @@ static HRESULT WINAPI d3d9_device_GetClipPlane(IDirect3DDevice9Ex *iface, DWORD index = min(index, device->max_user_clip_planes - 1); wined3d_mutex_lock(); - memcpy(plane, &wined3d_stateblock_get_state(device->state)->clip_planes[index], sizeof(struct wined3d_vec4)); + memcpy(plane, &device->stateblock_state->clip_planes[index], sizeof(struct wined3d_vec4)); wined3d_mutex_unlock(); return D3D_OK; @@ -2305,7 +2305,7 @@ static HRESULT WINAPI d3d9_device_GetClipPlane(IDirect3DDevice9Ex *iface, DWORD static void resolve_depth_buffer(struct d3d9_device *device) { - const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); + const struct wined3d_stateblock_state *state = device->stateblock_state; struct wined3d_rendertarget_view *wined3d_dsv; struct wined3d_resource *dst_resource; struct wined3d_texture *dst_texture; @@ -2356,7 +2356,7 @@ static HRESULT WINAPI d3d9_device_GetRenderState(IDirect3DDevice9Ex *iface, TRACE("iface %p, state %#x, value %p.\n", iface, state, value); wined3d_mutex_lock(); - device_state = wined3d_stateblock_get_state(device->state); + device_state = device->stateblock_state; *value = device_state->rs[state]; wined3d_mutex_unlock(); @@ -2525,7 +2525,7 @@ static HRESULT WINAPI d3d9_device_GetTexture(IDirect3DDevice9Ex *iface, DWORD st } wined3d_mutex_lock(); - state = wined3d_stateblock_get_state(device->state); + state = device->stateblock_state; if ((wined3d_texture = state->textures[stage])) { texture_impl = wined3d_texture_get_parent(wined3d_texture); @@ -2622,7 +2622,7 @@ static HRESULT WINAPI d3d9_device_GetTextureStageState(IDirect3DDevice9Ex *iface } wined3d_mutex_lock(); - *value = wined3d_stateblock_get_state(device->state)->texture_states[stage][tss_lookup[state]]; + *value = device->stateblock_state->texture_states[stage][tss_lookup[state]]; wined3d_mutex_unlock(); return D3D_OK; @@ -2667,7 +2667,7 @@ static HRESULT WINAPI d3d9_device_GetSamplerState(IDirect3DDevice9Ex *iface, } wined3d_mutex_lock(); - device_state = wined3d_stateblock_get_state(device->state); + device_state = device->stateblock_state; *value = device_state->sampler_states[sampler_idx][state]; wined3d_mutex_unlock(); @@ -2758,7 +2758,7 @@ static HRESULT WINAPI d3d9_device_GetScissorRect(IDirect3DDevice9Ex *iface, RECT TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - *rect = wined3d_stateblock_get_state(device->state)->scissor_rect; + *rect = device->stateblock_state->scissor_rect; wined3d_mutex_unlock(); return D3D_OK; @@ -2822,7 +2822,7 @@ static float WINAPI d3d9_device_GetNPatchMode(IDirect3DDevice9Ex *iface) /* wined3d critical section must be taken by the caller. */ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) { - const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); + const struct wined3d_stateblock_state *state = device->stateblock_state; struct wined3d_texture *texture; unsigned int i, map; @@ -2838,7 +2838,7 @@ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, int base_vertex, unsigned int start_vertex, unsigned int vertex_count) { - const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); + const struct wined3d_stateblock_state *state = device->stateblock_state; struct wined3d_vertex_declaration *wined3d_decl; struct wined3d_box box = {0, 0, 0, 1, 0, 1}; const struct wined3d_stream_state *stream; @@ -2884,7 +2884,7 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, static void d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device, unsigned int start_idx, unsigned int idx_count) { - const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); + const struct wined3d_stateblock_state *state = device->stateblock_state; struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct wined3d_resource *dst_resource; struct d3d9_indexbuffer *d3d9_buffer; @@ -3250,7 +3250,7 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, iface, src_start_idx, dst_idx, vertex_count, dst_buffer, declaration, flags); wined3d_mutex_lock(); - state = wined3d_stateblock_get_state(device->state); + state = device->stateblock_state; /* Note that an alternative approach would be to simply create these * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we @@ -3341,7 +3341,7 @@ static HRESULT WINAPI d3d9_device_GetVertexDeclaration(IDirect3DDevice9Ex *iface if (!declaration) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_declaration = wined3d_stateblock_get_state(device->state)->vertex_declaration)) + if ((wined3d_declaration = device->stateblock_state->vertex_declaration)) { declaration_impl = wined3d_vertex_declaration_get_parent(wined3d_declaration); *declaration = &declaration_impl->IDirect3DVertexDeclaration9_iface; @@ -3461,7 +3461,7 @@ static HRESULT WINAPI d3d9_device_GetFVF(IDirect3DDevice9Ex *iface, DWORD *fvf) TRACE("iface %p, fvf %p.\n", iface, fvf); wined3d_mutex_lock(); - if ((wined3d_declaration = wined3d_stateblock_get_state(device->state)->vertex_declaration)) + if ((wined3d_declaration = device->stateblock_state->vertex_declaration)) { d3d9_declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration); *fvf = d3d9_declaration->fvf; @@ -3527,7 +3527,7 @@ static HRESULT WINAPI d3d9_device_GetVertexShader(IDirect3DDevice9Ex *iface, IDi TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if ((wined3d_shader = wined3d_stateblock_get_state(device->state)->vs)) + if ((wined3d_shader = device->stateblock_state->vs)) { shader_impl = wined3d_shader_get_parent(wined3d_shader); *shader = &shader_impl->IDirect3DVertexShader9_iface; @@ -3586,7 +3586,7 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantF(IDirect3DDevice9Ex *i } wined3d_mutex_lock(); - src = wined3d_stateblock_get_state(device->state)->vs_consts_f; + src = device->stateblock_state->vs_consts_f; memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); @@ -3623,7 +3623,7 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantI(IDirect3DDevice9Ex *i count = WINED3D_MAX_CONSTS_I - start_idx; wined3d_mutex_lock(); - src = wined3d_stateblock_get_state(device->state)->vs_consts_i; + src = device->stateblock_state->vs_consts_i; memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); @@ -3658,7 +3658,7 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantB(IDirect3DDevice9Ex *i count = WINED3D_MAX_CONSTS_B - start_idx; wined3d_mutex_lock(); - memcpy(constants, &wined3d_stateblock_get_state(device->state)->vs_consts_b[start_idx], count * sizeof(*constants)); + memcpy(constants, &device->stateblock_state->vs_consts_b[start_idx], count * sizeof(*constants)); wined3d_mutex_unlock(); return D3D_OK; @@ -3669,14 +3669,13 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_vertexbuffer *buffer_impl = unsafe_impl_from_IDirect3DVertexBuffer9(buffer); - const struct wined3d_stateblock_state *state; struct wined3d_buffer *wined3d_buffer; HRESULT hr; TRACE("iface %p, stream_idx %u, buffer %p, offset %u, stride %u.\n", iface, stream_idx, buffer, offset, stride); - if (stream_idx >= ARRAY_SIZE(state->streams)) + if (stream_idx >= ARRAY_SIZE(device->stateblock_state->streams)) { WARN("Stream index %u out of range.\n", stream_idx); return WINED3DERR_INVALIDCALL; @@ -3685,9 +3684,8 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); if (!buffer_impl) { - const struct wined3d_stream_state *stream; - state = wined3d_stateblock_get_state(device->state); - stream = &state->streams[stream_idx]; + const struct wined3d_stream_state *stream = &device->stateblock_state->streams[stream_idx]; + offset = stream->offset; stride = stream->stride; wined3d_buffer = NULL; @@ -3736,8 +3734,7 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, } wined3d_mutex_lock(); - state = wined3d_stateblock_get_state(device->state); - stream = &state->streams[stream_idx]; + stream = &device->stateblock_state->streams[stream_idx]; if (stream->buffer) { buffer_impl = wined3d_buffer_get_parent(stream->buffer); @@ -3776,7 +3773,7 @@ static HRESULT WINAPI d3d9_device_GetStreamSourceFreq(IDirect3DDevice9Ex *iface, TRACE("iface %p, stream_idx %u, freq %p.\n", iface, stream_idx, freq); wined3d_mutex_lock(); - stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + stream = &device->stateblock_state->streams[stream_idx]; *freq = stream->flags | stream->frequency; wined3d_mutex_unlock(); @@ -3819,7 +3816,7 @@ static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3 return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_buffer = wined3d_stateblock_get_state(device->state)->index_buffer)) + if ((wined3d_buffer = device->stateblock_state->index_buffer)) { buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer9_iface; @@ -3889,7 +3886,7 @@ static HRESULT WINAPI d3d9_device_GetPixelShader(IDirect3DDevice9Ex *iface, IDir if (!shader) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_shader = wined3d_stateblock_get_state(device->state)->ps)) + if ((wined3d_shader = device->stateblock_state->ps)) { shader_impl = wined3d_shader_get_parent(wined3d_shader); *shader = &shader_impl->IDirect3DPixelShader9_iface; @@ -3934,7 +3931,7 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantF(IDirect3DDevice9Ex *if return WINED3DERR_INVALIDCALL; wined3d_mutex_lock(); - src = wined3d_stateblock_get_state(device->state)->ps_consts_f; + src = device->stateblock_state->ps_consts_f; memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); @@ -3971,7 +3968,7 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantI(IDirect3DDevice9Ex *if count = WINED3D_MAX_CONSTS_I - start_idx; wined3d_mutex_lock(); - src = wined3d_stateblock_get_state(device->state)->ps_consts_i; + src = device->stateblock_state->ps_consts_i; memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); @@ -4006,7 +4003,7 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantB(IDirect3DDevice9Ex *if count = WINED3D_MAX_CONSTS_I - start_idx; wined3d_mutex_lock(); - memcpy(constants, &wined3d_stateblock_get_state(device->state)->ps_consts_b[start_idx], count * sizeof(*constants)); + memcpy(constants, &device->stateblock_state->ps_consts_b[start_idx], count * sizeof(*constants)); wined3d_mutex_unlock(); return D3D_OK; @@ -4641,6 +4638,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_mutex_unlock(); return hr; } + device->stateblock_state = wined3d_stateblock_get_state(device->state); device->update_state = device->state; if (flags & D3DCREATE_MULTITHREADED) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index a65fa1cd8d4..a1ce3d5856c 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -151,7 +151,7 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) device->auto_mipmaps = 0; for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) { - if ((wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[i]) + if ((wined3d_texture = device->stateblock_state->textures[i]) && (texture = wined3d_texture_get_parent(wined3d_texture)) && texture->usage & D3DUSAGE_AUTOGENMIPMAP) device->auto_mipmaps |= 1u << i; -- 2.24.1

3 9

[PATCH 1/5] d3d9/tests: Register test window class upfront.
by Rémi Bernon March 6, 2020

March 6, 2020

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This patch series is just some tests cleanup, it shouldn't change the tested behavior or the results. It's there in preparation for some work on wined3d window styles. dlls/d3d9/tests/d3d9ex.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index d0967f0ac05..d1437726860 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -123,12 +123,6 @@ out: static HWND create_window(void) { - WNDCLASSA wc = {0}; - - wc.lpfnWndProc = DefWindowProcA; - wc.lpszClassName = "d3d9_test_wc"; - RegisterClassA(&wc); - return CreateWindowA("d3d9_test_wc", "d3d9_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); } @@ -4911,6 +4905,7 @@ static void test_pinned_buffers(void) START_TEST(d3d9ex) { DEVMODEW current_mode; + WNDCLASSA wc = {0}; d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) @@ -4937,6 +4932,10 @@ START_TEST(d3d9ex) return; } + wc.lpfnWndProc = DefWindowProcA; + wc.lpszClassName = "d3d9_test_wc"; + RegisterClassA(&wc); + test_qi_base_to_ex(); test_qi_ex_to_base(); test_swapchain_get_displaymode_ex(); @@ -4962,4 +4961,6 @@ START_TEST(d3d9ex) test_resource_access(); test_sysmem_draw(); test_pinned_buffers(); + + UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.25.0

3 11

[PATCH v5 1/9] jscript: Use NULL in frame->this_obj for the global code object.
by Gabriel Ivăncescu March 6, 2020

March 6, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7da8f70..3946d02 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1218,12 +1218,15 @@ static HRESULT interp_call_member(script_ctx_t *ctx) /* ECMA-262 3rd Edition 11.1.1 */ static HRESULT interp_this(script_ctx_t *ctx) { - call_frame_t *frame = ctx->call_ctx; + IDispatch *this_obj = ctx->call_ctx->this_obj; TRACE("\n"); - IDispatch_AddRef(frame->this_obj); - return stack_push(ctx, jsval_disp(frame->this_obj)); + if(!this_obj) + this_obj = ctx->host_global ? ctx->host_global : to_disp(ctx->global); + + IDispatch_AddRef(this_obj); + return stack_push(ctx, jsval_disp(this_obj)); } static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigned flags) @@ -2700,7 +2703,7 @@ static void print_backtrace(script_ctx_t *ctx) WARN("%u\t", depth); depth++; - if(frame->this_obj && frame->this_obj != to_disp(ctx->global) && frame->this_obj != ctx->host_global) + if(frame->this_obj) WARN("%p->", frame->this_obj); WARN("%s(", frame->function->name ? debugstr_w(frame->function->name) : "[unnamed]"); if(frame->base_scope && frame->base_scope->frame) { @@ -3055,13 +3058,10 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->ip = function->instr_off; frame->stack_base = ctx->stack_top; - if(this_obj) + if(this_obj) { frame->this_obj = this_obj; - else if(ctx->host_global) - frame->this_obj = ctx->host_global; - else - frame->this_obj = to_disp(ctx->global); - IDispatch_AddRef(frame->this_obj); + IDispatch_AddRef(frame->this_obj); + } if(function_instance) frame->function_instance = jsdisp_addref(function_instance); -- 2.21.0

2 15

[PATCH] windowscodecs: Fix ICNS encoder write_source call.
by Vincent Povirk March 6, 2020

March 6, 2020

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/windowscodecs/icnsformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 8194bc508a5..5b94906e809 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -401,7 +401,7 @@ static HRESULT WINAPI IcnsFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, if (SUCCEEDED(hr)) { hr = write_source(iface, pIBitmapSource, prc, - &GUID_WICPixelFormat32bppBGRA, 32, This->size, This->size); + &GUID_WICPixelFormat32bppBGRA, 32, FALSE, This->size, This->size); } return hr; -- 2.17.1

1 0

[PATCH] include: Add some MFT flags types.
by Nikolay Sivov March 6, 2020

March 6, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mftransform.idl | 108 +++++++++++++++++++++++++++++++--------- 1 file changed, 84 insertions(+), 24 deletions(-) diff --git a/include/mftransform.idl b/include/mftransform.idl index 8cc0ffbc50..59e40f95f7 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -18,6 +18,90 @@ import "mfobjects.idl"; +typedef [v1_enum] enum _MFT_MESSAGE_TYPE +{ + MFT_MESSAGE_COMMAND_FLUSH = 0x00000000, + MFT_MESSAGE_COMMAND_DRAIN = 0x00000001, + MFT_MESSAGE_SET_D3D_MANAGER = 0x00000002, + MFT_MESSAGE_DROP_SAMPLES = 0x00000003, + MFT_MESSAGE_COMMAND_TICK = 0x00000004, + MFT_MESSAGE_NOTIFY_BEGIN_STREAMING = 0x10000000, + MFT_MESSAGE_NOTIFY_END_STREAMING = 0x10000001, + MFT_MESSAGE_NOTIFY_END_OF_STREAM = 0x10000002, + MFT_MESSAGE_NOTIFY_START_OF_STREAM = 0x10000003, + MFT_MESSAGE_NOTIFY_RELEASE_RESOURCES = 0x10000004, + MFT_MESSAGE_NOTIFY_REACQUIRE_RESOURCES = 0x10000005, + MFT_MESSAGE_NOTIFY_EVENT = 0x10000006, + MFT_MESSAGE_COMMAND_SET_OUTPUT_STREAM_STATE = 0x10000007, + MFT_MESSAGE_COMMAND_FLUSH_OUTPUT_STREAM = 0x10000008, + MFT_MESSAGE_COMMAND_MARKER = 0x20000000 +} MFT_MESSAGE_TYPE; + +enum _MFT_SET_TYPE_FLAGS +{ + MFT_SET_TYPE_TEST_ONLY = 0x00000001, +}; + +enum _MFT_INPUT_STREAM_INFO_FLAGS +{ + MFT_INPUT_STREAM_WHOLE_SAMPLES = 0x00000001, + MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER = 0x00000002, + MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE = 0x00000004, + MFT_INPUT_STREAM_HOLDS_BUFFERS = 0x00000008, + MFT_INPUT_STREAM_DOES_NOT_ADDREF = 0x00000100, + MFT_INPUT_STREAM_REMOVABLE = 0x00000200, + MFT_INPUT_STREAM_OPTIONAL = 0x00000400, + MFT_INPUT_STREAM_PROCESSES_IN_PLACE = 0x00000800 +}; + +enum _MFT_INPUT_STATUS_FLAGS +{ + MFT_INPUT_STATUS_ACCEPT_DATA = 0x00000001, +}; + +enum _MFT_OUTPUT_STREAM_INFO_FLAGS +{ + MFT_OUTPUT_STREAM_WHOLE_SAMPLES = 0x00000001, + MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER = 0x00000002, + MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE = 0x00000004, + MFT_OUTPUT_STREAM_DISCARDABLE = 0x00000008, + MFT_OUTPUT_STREAM_OPTIONAL = 0x00000010, + MFT_OUTPUT_STREAM_PROVIDES_SAMPLES = 0x00000100, + MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES = 0x00000200, + MFT_OUTPUT_STREAM_LAZY_READ = 0x00000400, + MFT_OUTPUT_STREAM_REMOVABLE = 0x00000800 +}; + +enum _MFT_OUTPUT_DATA_BUFFER_FLAGS +{ + MFT_OUTPUT_DATA_BUFFER_INCOMPLETE = 0x01000000, + MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE = 0x00000100, + MFT_OUTPUT_DATA_BUFFER_STREAM_END = 0x00000200, + MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE = 0x00000300 +}; + +enum _MFT_OUTPUT_STATUS_FLAGS +{ + MFT_OUTPUT_STATUS_SAMPLE_READY = 0x00000001 +}; + +enum _MFT_PROCESS_OUTPUT_FLAGS +{ + MFT_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER = 0x00000001, + MFT_PROCESS_OUTPUT_REGENERATE_LAST_OUTPUT = 0x00000002 +}; + +enum _MFT_PROCESS_OUTPUT_STATUS +{ + MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS = 0x00000100 +}; + +enum _MFT_DRAIN_TYPE +{ + MFT_DRAIN_PRODUCE_TAILS = 0x00000000, + MFT_DRAIN_NO_TAILS = 0x00000001 +}; + typedef struct _MFT_INPUT_STREAM_INFO { LONGLONG hnsMaxLatency; @@ -42,30 +126,6 @@ typedef struct _MFT_OUTPUT_DATA_BUFFER IMFCollection *pEvents; } MFT_OUTPUT_DATA_BUFFER, *PMFT_OUTPUT_DATA_BUFFER; -typedef [v1_enum] enum _MFT_MESSAGE_TYPE -{ - MFT_MESSAGE_COMMAND_FLUSH = 0x00000000, - MFT_MESSAGE_COMMAND_DRAIN = 0x00000001, - MFT_MESSAGE_SET_D3D_MANAGER = 0x00000002, - MFT_MESSAGE_DROP_SAMPLES = 0x00000003, - MFT_MESSAGE_COMMAND_TICK = 0x00000004, - MFT_MESSAGE_NOTIFY_BEGIN_STREAMING = 0x10000000, - MFT_MESSAGE_NOTIFY_END_STREAMING = 0x10000001, - MFT_MESSAGE_NOTIFY_END_OF_STREAM = 0x10000002, - MFT_MESSAGE_NOTIFY_START_OF_STREAM = 0x10000003, - MFT_MESSAGE_COMMAND_MARKER = 0x20000000 -} MFT_MESSAGE_TYPE; - -enum _MFT_SET_TYPE_FLAGS -{ - MFT_SET_TYPE_TEST_ONLY = 0x00000001, -}; - -enum _MFT_INPUT_STATUS_FLAGS -{ - MFT_INPUT_STATUS_ACCEPT_DATA = 0x00000001, -}; - [ object, uuid(bf94c121-5b05-4e6f-8000-ba598961414d) -- 2.25.1

1 0