February 2020 - Wine-Commits

Nikolay Sivov : mf: Use separate list for source streams.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: adb420ee0df0ca885dfc97716376f894ddd21219 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb420ee0df0ca885dfc9771… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:55 2020 +0300 mf: Use separate list for source streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 218 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 179 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adb420ee0df0ca885dfc…

1 0

Nikolay Sivov : mf: Create separate topology object and use it as current.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: a93dde5ad8d93a1cdf666e868a76f35ec311f385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a93dde5ad8d93a1cdf666e86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:54 2020 +0300 mf: Create separate topology object and use it as current. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 243 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 125 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a93dde5ad8d93a1cdf66…

1 0

Nikolay Sivov : mf: Subscribe for next pipeline object event after processing current one.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 9d004b84663f7e8bcc1b966ba656d8f35bec09db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d004b84663f7e8bcc1b966b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:53 2020 +0300 mf: Subscribe for next pipeline object event after processing current one. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 2ef4b01028..6da495e3c1 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1416,6 +1416,10 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM failed: if (event) IMFMediaEvent_Release(event); + + if (FAILED(hr = IMFMediaEventGenerator_BeginGetEvent(event_source, iface, (IUnknown *)event_source))) + WARN("Failed to re-subscribe, hr %#x.\n", hr); + IMFMediaEventGenerator_Release(event_source); return hr;

1 0

Nikolay Sivov : mf: Add support for returning slowest/fastest rates for session.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: f4280cc04defcf9404e74f702a010f35d9ffdfb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4280cc04defcf9404e74f70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:52 2020 +0300 mf: Add support for returning slowest/fastest rates for session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 5ee4074379..2ef4b01028 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <math.h> #define COBJMACROS @@ -1447,20 +1448,73 @@ static ULONG WINAPI session_rate_support_Release(IMFRateSupport *iface) return IMFMediaSession_Release(&session->IMFMediaSession_iface); } +static void session_presentation_object_get_rate(IUnknown *object, MFRATE_DIRECTION direction, + BOOL thin, BOOL fastest, float *result) +{ + IMFRateSupport *rate_support; + float rate; + + if (SUCCEEDED(MFGetService(object, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support))) + { + rate = 0.0f; + if (fastest) + { + if (SUCCEEDED(IMFRateSupport_GetFastestRate(rate_support, direction, thin, &rate))) + *result = min(fabsf(rate), *result); + } + else + { + if (SUCCEEDED(IMFRateSupport_GetSlowestRate(rate_support, direction, thin, &rate))) + *result = max(fabsf(rate), *result); + } + + IMFRateSupport_Release(rate_support); + } +} + +static HRESULT session_get_presentation_rate(struct media_session *session, MFRATE_DIRECTION direction, + BOOL thin, BOOL fastest, float *result) +{ + struct media_source *source; + struct media_sink *sink; + + *result = 0.0f; + + EnterCriticalSection(&session->cs); + + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + session_presentation_object_get_rate((IUnknown *)source->source, direction, thin, fastest, result); + } + + LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) + { + session_presentation_object_get_rate((IUnknown *)sink->sink, direction, thin, fastest, result); + } + + LeaveCriticalSection(&session->cs); + + return S_OK; +} + static HRESULT WINAPI session_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { - FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + struct media_session *session = impl_session_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return session_get_presentation_rate(session, direction, thin, FALSE, rate); } static HRESULT WINAPI session_rate_support_GetFastestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { - FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + struct media_session *session = impl_session_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return session_get_presentation_rate(session, direction, thin, TRUE, rate); } static HRESULT WINAPI session_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate,

1 0

Matteo Bruni : wined3d: Optimize scanning changed textures in wined3d_device_apply_stateblock().
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: aa21b022bb79d945515b15e8293c043c8f77c979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa21b022bb79d945515b15e8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 28 11:25:02 2020 +0100 wined3d: Optimize scanning changed textures in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index add20cc63e..6474b02ccc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3843,7 +3843,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_color colour; struct wined3d_range range; BOOL set_blend_state; - DWORD map; + DWORD map, stage; TRACE("device %p, stateblock %p.\n", device, stateblock); @@ -3963,8 +3963,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, for (i = 0; i < ARRAY_SIZE(changed->samplerState); ++i) { - DWORD stage = i; - + stage = i; if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; map = changed->samplerState[i]; @@ -4013,13 +4012,14 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, state->streams[i].frequency | state->streams[i].flags); } - for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + map = changed->textures; + while (map) { - DWORD stage = i; + i = wined3d_bit_scan(&map); + stage = i; if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - if (changed->textures & (1u << i)) - wined3d_device_set_texture(device, stage, state->textures[i]); + wined3d_device_set_texture(device, stage, state->textures[i]); } for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i)

1 0

Matteo Bruni : wined3d: Optimize scanning changed stream states in wined3d_device_apply_stateblock().
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 02d3cfe0aee36f0228c44686cd34d564ee4f0f35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d3cfe0aee36f0228c44686… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 28 11:25:01 2020 +0100 wined3d: Optimize scanning changed stream states in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 863b483bab..add20cc63e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3998,14 +3998,19 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if (changed->scissorRect) wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); - for (i = 0; i < ARRAY_SIZE(state->streams); ++i) - { - if (changed->streamSource & (1u << i)) - wined3d_device_set_stream_source(device, i, state->streams[i].buffer, - state->streams[i].offset, state->streams[i].stride); - if (changed->streamFreq & (1u << i)) - wined3d_device_set_stream_source_freq(device, i, - state->streams[i].frequency | state->streams[i].flags); + map = changed->streamSource; + while (map) + { + i = wined3d_bit_scan(&map); + wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); + } + map = changed->streamFreq; + while (map) + { + i = wined3d_bit_scan(&map); + wined3d_device_set_stream_source_freq(device, i, + state->streams[i].frequency | state->streams[i].flags); } for (i = 0; i < ARRAY_SIZE(state->textures); ++i)

1 0

Zebediah Figura : d3dcompiler/tests: Port some tests to shader model 4.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 8ce03e2055ee3592912776a16eb5595d48a51ca2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce03e2055ee3592912776a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 11:24:00 2020 +0100 d3dcompiler/tests: Port some tests to shader model 4. In particular, port those for which there is an interesting difference in code generation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/Makefile.in | 1 + dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 562 +++++++++++++++++++++++++++++++++ dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 37 ++- dlls/d3dcompiler_47/tests/Makefile.in | 1 + 4 files changed, 585 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ce03e2055ee35929127…

1 0

Zebediah Figura : d3dcompiler/tests: Rewrite to use a separate d3d9 device for each test.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 6f809561467eae4979bc3fada822f3daa578992e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f809561467eae4979bc3fad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 11:23:59 2020 +0100 d3dcompiler/tests: Rewrite to use a separate d3d9 device for each test. This brings the d3dcompiler tests more in line with existing d3d9 tests, and allows potentially running the tests in parallel. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 701 ---------------------------------- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 678 ++++++++++++++++++++++++++++++++ dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 4 files changed, 680 insertions(+), 703 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f809561467eae4979bc…

1 0

Zebediah Figura : ddraw: Stop setting the device state in d3d_device7_SetClipPlane().
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: b9bf9df33b814b0025e8ae88e364dae752a2c476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9bf9df33b814b0025e8ae88… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 27 18:48:46 2020 -0600 ddraw: Stop setting the device state in d3d_device7_SetClipPlane(). 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/ddraw/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b244a0309b..7acc8e0db0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6526,8 +6526,6 @@ static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV wined3d_mutex_lock(); hr = wined3d_stateblock_set_clip_plane(device->update_state, idx, wined3d_plane); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, wined3d_plane); if (idx < ARRAY_SIZE(device->user_clip_planes)) { device->user_clip_planes[idx] = *wined3d_plane;

1 0

Zebediah Figura : ddraw: Retrieve transform state from the primary stateblock.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 0774e76802b6c749772b38ddfacf59a192f3a42d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0774e76802b6c749772b38dd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 27 18:48:43 2020 -0600 ddraw: Retrieve transform state from the primary stateblock. 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/ddraw/ddraw_private.h | 6 +++--- dlls/ddraw/device.c | 38 +++++++++++++++----------------------- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/utils.c | 21 +++------------------ dlls/ddraw/viewport.c | 24 +++++++++--------------- 5 files changed, 31 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0774e76802b6c749772b…

1 0