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

Zebediah Figura : wined3d: Make some wined3d_device functions static.
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 3b0f0b8aef9909bdbe4b9db8a1248c1698da3173 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b0f0b8aef9909bdbe4b9db8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 4 22:46:47 2020 -0600 wined3d: Make some wined3d_device functions static. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 32 ++++++++++++++++---------------- dlls/wined3d/wined3d.spec | 16 ---------------- include/wine/wined3d.h | 28 ---------------------------- 3 files changed, 16 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b0f0b8aef9909bdbe4b…

1 0

Zebediah Figura : wined3d: Remove now redundant error handling from wined3d_device_set_stream_source_freq().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 0ada20912575ad00db6debfaedacf2a455ff2274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ada20912575ad00db6debfa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 4 22:46:48 2020 -0600 wined3d: Remove now redundant error handling from wined3d_device_set_stream_source_freq(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 43505e6ad3..f58552a53d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1314,30 +1314,13 @@ HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *devi return WINED3D_OK; } -static HRESULT wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider) +static void wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider) { struct wined3d_stream_state *stream; UINT old_flags, old_freq; TRACE("device %p, stream_idx %u, divider %#x.\n", device, stream_idx, divider); - /* Verify input. At least in d3d9 this is invalid. */ - if ((divider & WINED3DSTREAMSOURCE_INSTANCEDATA) && (divider & WINED3DSTREAMSOURCE_INDEXEDDATA)) - { - WARN("INSTANCEDATA and INDEXEDDATA were set, returning D3DERR_INVALIDCALL.\n"); - return WINED3DERR_INVALIDCALL; - } - if ((divider & WINED3DSTREAMSOURCE_INSTANCEDATA) && !stream_idx) - { - WARN("INSTANCEDATA used on stream 0, returning D3DERR_INVALIDCALL.\n"); - return WINED3DERR_INVALIDCALL; - } - if (!divider) - { - WARN("Divider is 0, returning D3DERR_INVALIDCALL.\n"); - return WINED3DERR_INVALIDCALL; - } - stream = &device->state.streams[stream_idx]; old_flags = stream->flags; old_freq = stream->frequency; @@ -1346,8 +1329,6 @@ static HRESULT wined3d_device_set_stream_source_freq(struct wined3d_device *devi stream->frequency = divider & 0x7fffff; if (stream->frequency != old_freq || stream->flags != old_flags) wined3d_cs_emit_set_stream_source_freq(device->cs, stream_idx, stream->frequency, stream->flags); - - return WINED3D_OK; } static void wined3d_device_set_transform(struct wined3d_device *device,

1 0

Zebediah Figura : wined3d: Remove now redundant error handling from wined3d_device_set_light().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 63dc466aa6a614ce58357447ee21291c09c6b0aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=63dc466aa6a614ce58357447… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 4 22:46:49 2020 -0600 wined3d: Remove now redundant error handling from wined3d_device_set_light(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 38 +++----------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f58552a53d..567c2e8e64 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1372,46 +1372,16 @@ static void wined3d_device_get_transform(const struct wined3d_device *device, * stateblock problems. When capturing the state block, I duplicate the * hashmap, but when recording, just build a chain pretty much of commands to * be replayed. */ -static HRESULT wined3d_device_set_light(struct wined3d_device *device, +static void wined3d_device_set_light(struct wined3d_device *device, UINT light_idx, const struct wined3d_light *light) { struct wined3d_light_info *object = NULL; - HRESULT hr; float rho; TRACE("device %p, light_idx %u, light %p.\n", device, light_idx, light); - /* Check the parameter range. Need for speed most wanted sets junk lights - * which confuse the GL driver. */ - if (!light) - return WINED3DERR_INVALIDCALL; - - switch (light->type) - { - case WINED3D_LIGHT_POINT: - case WINED3D_LIGHT_SPOT: - case WINED3D_LIGHT_GLSPOT: - /* Incorrect attenuation values can cause the gl driver to crash. - * Happens with Need for speed most wanted. */ - if (light->attenuation0 < 0.0f || light->attenuation1 < 0.0f || light->attenuation2 < 0.0f) - { - WARN("Attenuation is negative, returning WINED3DERR_INVALIDCALL.\n"); - return WINED3DERR_INVALIDCALL; - } - break; - - case WINED3D_LIGHT_DIRECTIONAL: - case WINED3D_LIGHT_PARALLELPOINT: - /* Ignores attenuation */ - break; - - default: - WARN("Light type out of range, returning WINED3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; - } - - if (FAILED(hr = wined3d_light_state_set_light(&device->state.light_state, light_idx, light, &object))) - return hr; + if (FAILED(wined3d_light_state_set_light(&device->state.light_state, light_idx, light, &object))) + return; /* Initialize the object. */ TRACE("Light %u setting to type %#x, diffuse %s, specular %s, ambient %s, " @@ -1500,8 +1470,6 @@ static HRESULT wined3d_device_set_light(struct wined3d_device *device, } wined3d_cs_emit_set_light(device->cs, object); - - return WINED3D_OK; } static HRESULT wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable)

1 0

Zebediah Figura : wined3d: Return void from wined3d_device_set_light_enable().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 99ac513ce43bb7f1eb0e93ef561e706900a49491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99ac513ce43bb7f1eb0e93ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 4 22:46:50 2020 -0600 wined3d: Return void from wined3d_device_set_light_enable(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 567c2e8e64..4224472df5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1472,7 +1472,7 @@ static void wined3d_device_set_light(struct wined3d_device *device, wined3d_cs_emit_set_light(device->cs, object); } -static HRESULT wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) +static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) { struct wined3d_light_info *light_info; @@ -1487,14 +1487,12 @@ static HRESULT wined3d_device_set_light_enable(struct wined3d_device *device, UI if (!(light_info = wined3d_light_state_get_light(&device->state.light_state, light_idx))) { FIXME("Adding default lights has failed dismally\n"); - return WINED3DERR_INVALIDCALL; + return; } } wined3d_light_state_enable_light(&device->state.light_state, &device->adapter->d3d_info, light_info, enable); wined3d_cs_emit_set_light_enable(device->cs, light_idx, enable); - - return WINED3D_OK; } static HRESULT wined3d_device_set_clip_plane(struct wined3d_device *device,

1 0

Zebediah Figura : wined3d: Remove now redundant error handling from wined3d_device_set_sampler_state().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 218060940a1a6284b60b13e54240d4f78478d28a URL: https://source.winehq.org/git/wine.git/?a=commit;h=218060940a1a6284b60b13e5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 4 22:46:51 2020 -0600 wined3d: Remove now redundant error handling from wined3d_device_set_sampler_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4224472df5..768f4bfed5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1749,12 +1749,6 @@ static void wined3d_device_set_sampler_state(struct wined3d_device *device, if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3) sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - if (sampler_idx >= ARRAY_SIZE(device->state.sampler_states)) - { - WARN("Invalid sampler %u.\n", sampler_idx); - return; /* Windows accepts overflowing this array ... we do not. */ - } - if (value == device->state.sampler_states[sampler_idx][state]) { TRACE("Application is setting the old value over, nothing to do.\n");

1 0

Hans Leidekker : configure: Get rid of an unused powl check.
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 6dc3edeba8cbab20f5e2bedba2f47fd36cf75b9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dc3edeba8cbab20f5e2bedb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 5 10:27:25 2020 +0100 configure: Get rid of an unused powl check. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- 3 files changed, 5 deletions(-) diff --git a/configure b/configure index feba035107..d536aa28b9 100755 --- a/configure +++ b/configure @@ -19629,7 +19629,6 @@ for ac_func in \ nearbyintf \ nexttoward \ nexttowardf \ - powl \ remainder \ remainderf \ remquo \ diff --git a/configure.ac b/configure.ac index e411c2eb0e..f74d539f4e 100644 --- a/configure.ac +++ b/configure.ac @@ -2712,7 +2712,6 @@ AC_CHECK_FUNCS(\ nearbyintf \ nexttoward \ nexttowardf \ - powl \ remainder \ remainderf \ remquo \ diff --git a/include/config.h.in b/include/config.h.in index 1d0b216b6a..de434d6ed2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -704,9 +704,6 @@ /* Define to 1 if you have the <port.h> header file. */ #undef HAVE_PORT_H -/* Define to 1 if you have the `powl' function. */ -#undef HAVE_POWL - /* Define if we can use ppdev.h for parallel port access */ #undef HAVE_PPDEV

1 0

Zhiyi Zhang : wined3d: Refactor wined3d_enum_adapter_modes() to wined3d_output_get_mode().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: a0dbb1e469ffd0102c46044ce9d0723d47f1fdc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0dbb1e469ffd0102c46044c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 5 23:03:23 2020 +0800 wined3d: Refactor wined3d_enum_adapter_modes() to wined3d_output_get_mode(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 7 ++++++- dlls/d3d9/directx.c | 20 ++++++++++++++++---- dlls/ddraw/ddraw.c | 16 +++++++++++++++- dlls/ddraw/ddraw_private.h | 2 ++ dlls/dxgi/output.c | 6 +++--- dlls/wined3d/directx.c | 23 +++++++++++++---------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 6 +++--- 9 files changed, 62 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0dbb1e469ffd0102c46…

1 0

Zhiyi Zhang : wined3d: Refactor wined3d_get_adapter_mode_count() to wined3d_output_get_mode_count().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 1bb5c9187c14504a6fe5ca5e787000f5168156db URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb5c9187c14504a6fe5ca5e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 5 23:03:40 2020 +0800 wined3d: Refactor wined3d_get_adapter_mode_count() to wined3d_output_get_mode_count(). 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/directx.c | 8 ++++++-- dlls/d3d9/directx.c | 20 ++++++++++++++------ dlls/dxgi/output.c | 4 +--- dlls/wined3d/directx.c | 21 +++++++++------------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 7e9b72eea3..b78b119d22 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -134,12 +134,16 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, static UINT WINAPI d3d8_GetAdapterModeCount(IDirect3D8 *iface, UINT adapter) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - UINT count; + unsigned int output_idx, count; TRACE("iface %p, adapter %u.\n", iface, adapter); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return 0; + wined3d_mutex_lock(); - count = wined3d_get_adapter_mode_count(d3d8->wined3d, adapter, + count = wined3d_output_get_mode_count(d3d8->wined3d_outputs[output_idx], WINED3DFMT_UNKNOWN, WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 00632019c7..83bb3d8217 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -149,20 +149,24 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte static UINT WINAPI d3d9_GetAdapterModeCount(IDirect3D9Ex *iface, UINT adapter, D3DFORMAT format) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - UINT ret; + unsigned int output_idx, count; TRACE("iface %p, adapter %u, format %#x.\n", iface, adapter, format); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return 0; + /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out. */ if (format != D3DFMT_X8R8G8B8 && format != D3DFMT_R5G6B5) return 0; wined3d_mutex_lock(); - ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, + count = wined3d_output_get_mode_count(d3d9->wined3d_outputs[output_idx], wined3dformat_from_d3dformat(format), WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); - return ret; + return count; } static HRESULT WINAPI d3d9_EnumAdapterModes(IDirect3D9Ex *iface, UINT adapter, @@ -440,19 +444,23 @@ static UINT WINAPI d3d9_GetAdapterModeCountEx(IDirect3D9Ex *iface, UINT adapter, const D3DDISPLAYMODEFILTER *filter) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - UINT ret; + unsigned int output_idx, count; TRACE("iface %p, adapter %u, filter %p.\n", iface, adapter, filter); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return 0; + if (filter->Format != D3DFMT_X8R8G8B8 && filter->Format != D3DFMT_R5G6B5) return 0; wined3d_mutex_lock(); - ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, + count = wined3d_output_get_mode_count(d3d9->wined3d_outputs[output_idx], wined3dformat_from_d3dformat(filter->Format), filter->ScanLineOrdering); wined3d_mutex_unlock(); - return ret; + return count; } static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface, diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 063d72e13f..fe8dd7b5c0 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -107,7 +107,6 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, enum wined3d_format_id wined3d_format; struct wined3d_display_mode mode; unsigned int i, max_count; - struct wined3d *wined3d; HRESULT hr; if (!mode_count) @@ -122,8 +121,7 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, wined3d_format = wined3dformat_from_dxgi_format(format); wined3d_mutex_lock(); - wined3d = output->adapter->factory->wined3d; - max_count = wined3d_get_adapter_mode_count(wined3d, output->adapter->ordinal, + max_count = wined3d_output_get_mode_count(output->wined3d_output, wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); if (!modes) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6687735088..f873ed56b2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -952,7 +952,7 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in of the same bpp but different resolutions */ /* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */ -UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, +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) { const struct wined3d_adapter *adapter; @@ -962,20 +962,17 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad UINT format_bits; DEVMODEW mode; - TRACE("wined3d %p, adapter_idx %u, format %s, scanline_ordering %#x.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), scanline_ordering); + TRACE("output %p, format %s, scanline_ordering %#x.\n", + output, debug_d3dformat(format_id), scanline_ordering); - if (adapter_idx >= wined3d->adapter_count) - return 0; - - adapter = wined3d->adapters[adapter_idx]; + adapter = output->adapter; format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET); format_bits = format->byte_count * CHAR_BIT; memset(&mode, 0, sizeof(mode)); mode.dmSize = sizeof(mode); - while (EnumDisplaySettingsExW(adapter->device_name, j++, &mode, 0)) + while (EnumDisplaySettingsExW(output->device_name, j++, &mode, 0)) { if (mode.dmFields & DM_DISPLAYFLAGS) { @@ -999,7 +996,7 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad } } - TRACE("Returning %u matching modes (out of %u total) for adapter %u.\n", i, j, adapter_idx); + TRACE("Returning %u matching modes (out of %u total) for output %p.\n", i, j, output); return i; } @@ -1093,10 +1090,10 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w TRACE("wined3d %p, adapter_idx %u, mode %p.\n", wined3d, adapter_idx, mode); - if (!(mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, + if (!(mode_count = wined3d_output_get_mode_count(&wined3d->adapters[adapter_idx]->outputs[0], mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN))) { - WARN("Adapter has 0 matching modes.\n"); + WARN("Output has 0 matching modes.\n"); return E_FAIL; } @@ -1829,7 +1826,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap if (!windowed) { /* If the requested display format is not available, don't continue. */ - if (!wined3d_get_adapter_mode_count(wined3d, adapter_idx, + if (!wined3d_output_get_mode_count(&wined3d->adapters[adapter_idx]->outputs[0], display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN)) { TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 71f078f0fb..f1dc26794e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -14,7 +14,6 @@ @ 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_mode_count(ptr long long long) @ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @@ -162,6 +161,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) +@ cdecl wined3d_output_get_mode_count(ptr long long) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_take_ownership(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4405b7b7ea..1161a624b9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2267,8 +2267,6 @@ HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, 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); -UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, @@ -2501,6 +2499,8 @@ HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *devi 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); +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_take_ownership(const struct wined3d_output *output, BOOL exclusive);

1 0

Zhiyi Zhang : wined3d: Get output from window in wined3d_swapchain_state_init().
by Alexandre Julliard 05 Mar '20

05 Mar '20

Module: wine Branch: master Commit: 54d0869b2e3d1837d7a09ab246043c612b00a43c URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d0869b2e3d1837d7a09ab2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 5 23:03:53 2020 +0800 wined3d: Get output from window in wined3d_swapchain_state_init(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 62bab65fcf..c7c751f736 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -257,6 +257,38 @@ struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wi return swapchain->back_buffers[back_buffer_idx]; } +static struct wined3d_output * get_output_from_window(const struct wined3d *wined3d, HWND hwnd) +{ + unsigned int adapter_idx, output_idx; + struct wined3d_adapter *adapter; + MONITORINFOEXW monitor_info; + HMONITOR monitor; + + TRACE("wined3d %p, hwnd %p.\n", wined3d, hwnd); + + monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); + monitor_info.cbSize = sizeof(monitor_info); + if (!GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info)) + { + ERR("Failed to get monitor information.\n"); + return NULL; + } + + for (adapter_idx = 0; adapter_idx < wined3d->adapter_count; ++adapter_idx) + { + adapter = wined3d->adapters[adapter_idx]; + for (output_idx = 0; output_idx < adapter->output_count; ++output_idx) + { + if (!lstrcmpiW(adapter->outputs[output_idx].device_name, monitor_info.szDevice)) + return &adapter->outputs[output_idx]; + } + } + + /* Because wined3d only supports one output right now. A window can be on non-primary outputs + * and thus fails to get its correct output. In this case, return the primary output for now */ + return &wined3d->adapters[0]->outputs[0]; +} + HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, struct wined3d_raster_status *raster_status) { @@ -767,10 +799,17 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d *wined3d, unsigned int adapter_idx) { + struct wined3d_output *output; HRESULT hr; state->desc = *desc; + if (!(output = get_output_from_window(wined3d, window))) + { + WARN("Failed to get output from window %p.\n", window); + return E_FAIL; + } + if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &state->original_mode, NULL))) { ERR("Failed to get current display mode, hr %#x.\n", hr); @@ -781,11 +820,10 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat { if (desc->flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { - struct wined3d_adapter *adapter = wined3d->adapters[adapter_idx]; - state->d3d_mode.width = desc->backbuffer_width; state->d3d_mode.height = desc->backbuffer_height; - state->d3d_mode.format_id = adapter_format_from_backbuffer_format(adapter, desc->backbuffer_format); + state->d3d_mode.format_id = adapter_format_from_backbuffer_format(output->adapter, + desc->backbuffer_format); state->d3d_mode.refresh_rate = desc->refresh_rate; state->d3d_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; }

1 0

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

05 Mar '20

Module: wine Branch: master Commit: 878211c36f5aa279542c1e560a61ceb622399e43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=878211c36f5aa279542c1e56… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 5 23:04:13 2020 +0800 wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_fullscreen(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 14 ++++++-------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 004bd1457d..603cf171e2 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -164,7 +164,7 @@ static HRESULT dxgi_swapchain_set_fullscreen_state(struct wined3d_swapchain_stat wined3d_mutex_lock(); hr = wined3d_swapchain_state_set_fullscreen(state, swapchain_desc, - adapter->factory->wined3d, adapter->ordinal, NULL); + adapter->factory->wined3d, dxgi_output->wined3d_output, NULL); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 768f4bfed5..85b651ffc7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5147,7 +5147,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, - swapchain_desc, device->wined3d, device->adapter->ordinal, mode))) + swapchain_desc, device->wined3d, &device->adapter->outputs[0], mode))) return hr; /* Switch from fullscreen to windowed. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c7c751f736..a70b6c1e06 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1604,13 +1604,13 @@ 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, - unsigned int adapter_idx, const struct wined3d_display_mode *mode) + 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, adapter_idx %u, mode %p.\n", - state, swapchain_desc, wined3d, adapter_idx, mode); + TRACE("state %p, swapchain_desc %p, wined3d %p, output %p, mode %p.\n", + state, swapchain_desc, wined3d, output, mode); if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { @@ -1622,12 +1622,10 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st { if (!swapchain_desc->windowed) { - const struct wined3d_adapter *adapter = wined3d->adapters[adapter_idx]; - actual_mode.width = swapchain_desc->backbuffer_width; actual_mode.height = swapchain_desc->backbuffer_height; actual_mode.refresh_rate = swapchain_desc->refresh_rate; - actual_mode.format_id = adapter_format_from_backbuffer_format(adapter, + actual_mode.format_id = adapter_format_from_backbuffer_format(output->adapter, swapchain_desc->backbuffer_format); actual_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } @@ -1637,7 +1635,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st } } - 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))) return hr; } else @@ -1645,7 +1643,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, 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); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f1dc26794e..5c3efbdc8b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -283,7 +283,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_set_fullscreen(ptr ptr ptr long ptr) +@ cdecl wined3d_swapchain_state_set_fullscreen(ptr 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 05684aeb3b..3e852bd4e6 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -565,7 +565,7 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam wined3d_swapchain_get_desc(swapchain, &swapchain_desc); swapchain_desc.windowed = !swapchain_desc.windowed; wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, - swapchain->device->wined3d, swapchain->device->adapter->ordinal, NULL); + swapchain->device->wined3d, &swapchain->device->adapter->outputs[0], NULL); wined3d_wndproc_mutex_unlock(); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1161a624b9..cb8f19981a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2762,7 +2762,7 @@ HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_s struct wined3d *wined3d, unsigned int adapter_idx, 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, - unsigned int adapter_idx, const struct wined3d_display_mode *mode); + 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);

1 0