May 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : mf: Preroll on sink start.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: cbf156b780d60e664300bcd0ad51f5aeb4afdd3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf156b780d60e664300bcd0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 13 16:42:08 2020 +0300 mf: Preroll on sink start. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 66fdf471ad..5f035a801c 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -567,6 +567,8 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockStart(IMFClockStateSink * hr = MF_E_NOT_INITIALIZED; IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkStarted, &GUID_NULL, hr, NULL); + if (SUCCEEDED(hr)) + audio_renderer_preroll(renderer); LeaveCriticalSection(&renderer->cs); return hr;

1 0

Nikolay Sivov : mf/sar: Implement sample processing.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 3d51816d1cdf3e8aae1df0417ecf350c6237bc82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d51816d1cdf3e8aae1df041… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 13 16:42:09 2020 +0300 mf/sar: Implement sample processing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 275 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- include/mfapi.h | 1 + 2 files changed, 271 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d51816d1cdf3e8aae1d…

1 0

Henri Verbeet : wined3d: Implement Vulkan image shader resource view descriptors.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: bd63ec2f63cddedc1c4aa267b58e5e49dc8f65f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd63ec2f63cddedc1c4aa267… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 19:34:49 2020 +0430 wined3d: Implement Vulkan image shader resource view descriptors. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 45 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 12 +++++++++++ 2 files changed, 57 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4c12cff7d1..4098ee6cc4 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1330,8 +1330,13 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con const struct wined3d_shader_resource_binding *binding; struct wined3d_shader_resource_bindings *bindings; const VkDescriptorBufferInfo *buffer_info; + struct wined3d_shader_resource_view *srv; + const VkDescriptorImageInfo *image_info; + struct wined3d_resource *resource; VkDescriptorSet vk_descriptor_set; + struct wined3d_view_vk *view_vk; struct wined3d_buffer *buffer; + VkDescriptorType type; VkResult vr; size_t i; @@ -1362,6 +1367,36 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: + if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) + { + FIXME("NULL shader resource views not implemented.\n"); + return false; + } + resource = srv->resource; + + view_vk = &wined3d_shader_resource_view_vk(srv)->view_vk; + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Buffer SRV descriptors not implemented.\n"); + return false; + } + else + { + struct wined3d_texture_vk *texture_vk = wined3d_texture_vk(texture_from_resource(resource)); + + if (view_vk->u.vk_image_info.imageView) + image_info = &view_vk->u.vk_image_info; + else + image_info = wined3d_texture_vk_get_default_image_info(texture_vk, context_vk); + type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; + } + + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding->binding_idx, type, NULL, image_info, NULL)) + return false; + break; + default: FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); return false; @@ -1465,6 +1500,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * const struct wined3d_shader_resource_bindings *bindings = &context_vk->compute.bindings; struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; const struct wined3d_shader_resource_binding *binding; + struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; struct wined3d_buffer *buffer; size_t i; @@ -1487,6 +1523,15 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: + if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) + break; + + if (srv->resource->type != WINED3D_RTYPE_BUFFER) + wined3d_texture_load(texture_from_resource(srv->resource), &context_vk->c, FALSE); + wined3d_context_vk_reference_shader_resource_view(context_vk, wined3d_shader_resource_view_vk(srv)); + break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 321d58b0bf..8b7fd1205f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5671,6 +5671,18 @@ static inline void wined3d_context_vk_reference_rendertarget_view(const struct w rtv_vk->command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_shader_resource_view(const struct wined3d_context_vk *context_vk, + struct wined3d_shader_resource_view_vk *srv_vk) +{ + struct wined3d_resource *resource = srv_vk->v.resource; + + if (resource->type == WINED3D_RTYPE_BUFFER) + wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); + else + wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); + srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; +} + static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) {

1 0

Nikolay Sivov : mf: Avoid unnecessary prerolling calls in SAR.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: bd1bfd2c8aaa270e86948a3bec0566382c09f0c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd1bfd2c8aaa270e86948a3b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 13 16:42:07 2020 +0300 mf: Avoid unnecessary prerolling calls in SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index d5dc0b4f38..66fdf471ad 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -41,6 +41,7 @@ enum stream_state enum audio_renderer_flags { SAR_SHUT_DOWN = 0x1, + SAR_PREROLLED = 0x2, }; struct audio_renderer @@ -179,6 +180,7 @@ static void audio_renderer_release_audio_client(struct audio_renderer *renderer) if (renderer->audio_volume) ISimpleAudioVolume_Release(renderer->audio_volume); renderer->audio_volume = NULL; + renderer->flags &= ~SAR_PREROLLED; } static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) @@ -409,10 +411,14 @@ static const IMFMediaSinkVtbl audio_renderer_sink_vtbl = static void audio_renderer_preroll(struct audio_renderer *renderer) { - int i; + unsigned int i; + + if (renderer->flags & SAR_PREROLLED) + return; for (i = 0; i < 2; ++i) IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); + renderer->flags |= SAR_PREROLLED; } static HRESULT WINAPI audio_renderer_preroll_QueryInterface(IMFMediaSinkPreroll *iface, REFIID riid, void **obj) @@ -586,6 +592,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockStop(IMFClockStateSink *i else WARN("Failed to stop audio client, hr %#x.\n", hr); renderer->state = STREAM_STATE_STOPPED; + renderer->flags &= ~SAR_PREROLLED; } } else

1 0

Henri Verbeet : wined3d: Implement Vulkan sampler descriptors.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 2a9142de5ce016352bad613136fd7cbb3622af45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a9142de5ce016352bad6131… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 19:34:51 2020 +0430 wined3d: Implement Vulkan sampler descriptors. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4e4e064250..ba1f6bb926 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1335,6 +1335,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con struct wined3d_resource *resource; VkDescriptorSet vk_descriptor_set; struct wined3d_view_vk *view_vk; + struct wined3d_sampler *sampler; struct wined3d_buffer *buffer; VkBufferView *buffer_view; VkDescriptorType type; @@ -1400,6 +1401,14 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: + if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) + sampler = context_vk->c.device->null_sampler; + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, + VK_DESCRIPTOR_TYPE_SAMPLER, NULL, &wined3d_sampler_vk(sampler)->vk_image_info, NULL)) + return false; + break; + default: FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); return false; @@ -1506,6 +1515,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * struct wined3d_shader_resource_view_vk *srv_vk; struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; + struct wined3d_sampler *sampler; struct wined3d_buffer *buffer; size_t i; @@ -1551,6 +1561,12 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: + if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) + sampler = context_vk->c.device->null_sampler; + wined3d_context_vk_reference_sampler(context_vk, wined3d_sampler_vk(sampler)); + break; + default: FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35b0815d95..93852e0de7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5662,6 +5662,12 @@ static inline void wined3d_context_vk_reference_texture(const struct wined3d_con texture_vk->command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_sampler(const struct wined3d_context_vk *context_vk, + struct wined3d_sampler_vk *sampler_vk) +{ + sampler_vk->command_buffer_id = context_vk->current_command_buffer.id; +} + static inline void wined3d_context_vk_reference_rendertarget_view(const struct wined3d_context_vk *context_vk, struct wined3d_rendertarget_view_vk *rtv_vk) {

1 0

Philip Rebohle : include: Add IDXGIFactory6.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 1a9830ade4d819082e62c3334032798c97086b3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a9830ade4d819082e62c333… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Wed May 13 19:34:54 2020 +0430 include: Add IDXGIFactory6. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi1_6.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/dxgi1_6.idl b/include/dxgi1_6.idl index 9dcf9f26b4..fba72d5760 100644 --- a/include/dxgi1_6.idl +++ b/include/dxgi1_6.idl @@ -34,6 +34,13 @@ typedef enum DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_CURSOR_STRETCHED = 0x4, } DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS; +typedef enum DXGI_GPU_PREFERENCE +{ + DXGI_GPU_PREFERENCE_UNSPECIFIED = 0x0, + DXGI_GPU_PREFERENCE_MINIMUM_POWER = 0x1, + DXGI_GPU_PREFERENCE_HIGH_PERFORMANCE = 0x2, +} DXGI_GPU_PREFERENCE; + typedef struct DXGI_ADAPTER_DESC3 { WCHAR Description[128]; @@ -96,3 +103,19 @@ interface IDXGIOutput6 : IDXGIOutput5 [out] UINT *flags ); } + +[ + object, + uuid(c1b6694f-ff09-44a9-b03c-77900a0a1d17), + local, + pointer_default(unique) +] +interface IDXGIFactory6 : IDXGIFactory5 +{ + HRESULT EnumAdapterByGpuPreference( + [in] UINT adapter_idx, + [in] DXGI_GPU_PREFERENCE gpu_preference, + [in] REFIID iid, + [out] void **adapter + ); +}

1 0

Gijs Vermeulen : winemac: Add default case in isMouseMoveEventType.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 4475524e5941a77669d68510f3ffff99aa3ffbd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4475524e5941a77669d68510… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed May 13 17:27:35 2020 +0200 winemac: Add default case in isMouseMoveEventType. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 87a73b6da9..8e66721da1 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1229,9 +1229,9 @@ static NSString* WineLocalizedString(unsigned int stringID) case kCGEventRightMouseDragged: case kCGEventOtherMouseDragged: return TRUE; + default: + return FALSE; } - - return FALSE; } - (int) warpsFinishedByEventTime:(CGEventTimestamp)eventTime location:(CGPoint)eventLocation

1 0

Philip Rebohle : dxgi: Add stubs for IDXGIFactory7.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 6cd1139691be00e2fd747a47adad75d11cbc2149 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cd1139691be00e2fd747a47… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Wed May 13 19:34:57 2020 +0430 dxgi: Add stubs for IDXGIFactory7. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 20 ++++++++++++++++++++ include/wine/winedxgi.idl | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index c6acbaaf67..6acce516de 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -36,6 +36,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *i TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IWineDXGIFactory) + || IsEqualGUID(iid, &IID_IDXGIFactory7) || IsEqualGUID(iid, &IID_IDXGIFactory6) || IsEqualGUID(iid, &IID_IDXGIFactory5) || IsEqualGUID(iid, &IID_IDXGIFactory4) @@ -483,6 +484,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByGpuPreference(IWineDX return hr; } +static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterAdaptersChangedEvent(IWineDXGIFactory *iface, + HANDLE event, DWORD *cookie) +{ + FIXME("iface %p, event %p, cookie %p stub!\n", iface, event, cookie); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_UnregisterAdaptersChangedEvent(IWineDXGIFactory *iface, + DWORD cookie) +{ + FIXME("iface %p, cookie %#x stub!\n", iface, cookie); + + return E_NOTIMPL; +} + static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = { dxgi_factory_QueryInterface, @@ -521,6 +538,9 @@ static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = dxgi_factory_CheckFeatureSupport, /* IDXGIFactory6 methods */ dxgi_factory_EnumAdapterByGpuPreference, + /* IDXGIFactory7 methods */ + dxgi_factory_RegisterAdaptersChangedEvent, + dxgi_factory_UnregisterAdaptersChangedEvent, }; struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 95c99b2535..83012047ea 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -89,6 +89,6 @@ interface IWineDXGIAdapter : IDXGIAdapter4 local, uuid(ea02a0d1-4c95-488a-a82c-6034621e8c4f) ] -interface IWineDXGIFactory : IDXGIFactory6 +interface IWineDXGIFactory : IDXGIFactory7 { }

1 0

Zhiyi Zhang : d3d8: Store a struct d3d8 in struct d3d8_device.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: 97fce0b3af87d8425cb484cb47eb02d4717f322b URL: https://source.winehq.org/git/wine.git/?a=commit;h=97fce0b3af87d8425cb484cb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 12 20:49:16 2020 +0800 d3d8: Store a struct d3d8 in struct d3d8_device. So that d3d_parent->wined3d_outputs can be directly accessed in device. 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/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 04bca7ddfa..e98746a13b 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -115,7 +115,7 @@ struct d3d8_device LONG ref; struct wined3d_device *wined3d_device; unsigned int adapter_ordinal; - IDirect3D8 *d3d_parent; + struct d3d8 *d3d_parent; struct d3d8_handle_table handle_table; /* FVF management */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e123502dab..d3a88acc35 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -609,7 +609,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) if (!ref) { - IDirect3D8 *parent = device->d3d_parent; + IDirect3D8 *parent = &device->d3d_parent->IDirect3D8_iface; unsigned i; TRACE("Releasing wined3d device %p.\n", device->wined3d_device); @@ -705,7 +705,8 @@ static HRESULT WINAPI d3d8_device_GetDirect3D(IDirect3DDevice8 *iface, IDirect3D if (!d3d8) return D3DERR_INVALIDCALL; - return IDirect3D8_QueryInterface(device->d3d_parent, &IID_IDirect3D8, (void **)d3d8); + return IDirect3D8_QueryInterface(&device->d3d_parent->IDirect3D8_iface, &IID_IDirect3D8, + (void **)d3d8); } static HRESULT WINAPI d3d8_device_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS8 *caps) @@ -791,8 +792,8 @@ static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface, return hr; } - if (FAILED(hr = IDirect3D8_GetAdapterDisplayMode(device->d3d_parent, device->adapter_ordinal, - &mode))) + if (FAILED(hr = IDirect3D8_GetAdapterDisplayMode(&device->d3d_parent->IDirect3D8_iface, + device->adapter_ordinal, &mode))) { WARN("Failed to get device display mode, hr %#x.\n", hr); return hr; @@ -3835,8 +3836,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine device->implicit_swapchain = wined3d_swapchain; - device->d3d_parent = &parent->IDirect3D8_iface; - IDirect3D8_AddRef(device->d3d_parent); + device->d3d_parent = parent; + IDirect3D8_AddRef(&parent->IDirect3D8_iface); return D3D_OK;

1 0

Zhiyi Zhang : wined3d: Specify a wined3d output for swapchain creation.
by Alexandre Julliard May 13, 2020

May 13, 2020

Module: wine Branch: master Commit: d3e088cc0002addf75fe5a1dc96ae97db80040c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3e088cc0002addf75fe5a1d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 12 20:49:31 2020 +0800 wined3d: Specify a wined3d output for swapchain creation. As tests showed, DirectDraw, Direct3D 8 and 9 always use the adapter specified in the device creation parameters regardless of the device window position when creating a swapchain. Whereas DXGI uses the device window position to determine which DXGI output to use. 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/d3d8/device.c | 21 +++++++++++++++------ dlls/d3d9/device.c | 21 ++++++++++++++------- dlls/ddraw/ddraw.c | 1 + dlls/dxgi/device.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- dlls/dxgi/dxgi_private.h | 4 +++- dlls/dxgi/swapchain.c | 33 +++++++++++++++++++++++++++++---- dlls/dxgi/utils.c | 8 ++++++-- dlls/wined3d/device.c | 1 + dlls/wined3d/swapchain.c | 14 +++----------- include/wine/wined3d.h | 1 + 10 files changed, 116 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3e088cc0002addf75fe…

1 0