June 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : mf: Forward grabber clock state change calls to user callback.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 672ce5c7d1c1ea92ef56e762d26cb51d69404e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=672ce5c7d1c1ea92ef56e762… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 11 15:40:05 2019 +0300 mf: Forward grabber clock state change calls to user callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 7bc566f..af9666c 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1127,7 +1127,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockStart(IMFClockStateSink * sample_grabber_set_state(grabber, SINK_STATE_RUNNING); - return S_OK; + return IMFSampleGrabberSinkCallback_OnClockStart(sample_grabber_get_callback(grabber), systime, offset); } static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) @@ -1138,14 +1138,16 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *i sample_grabber_set_state(grabber, SINK_STATE_STOPPED); - return S_OK; + return IMFSampleGrabberSinkCallback_OnClockStop(sample_grabber_get_callback(grabber), systime); } static HRESULT WINAPI sample_grabber_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) { + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); - return S_OK; + return IMFSampleGrabberSinkCallback_OnClockPause(sample_grabber_get_callback(grabber), systime); } static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) @@ -1156,14 +1158,16 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink sample_grabber_set_state(grabber, SINK_STATE_RUNNING); - return S_OK; + return IMFSampleGrabberSinkCallback_OnClockRestart(sample_grabber_get_callback(grabber), systime); } static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) { - FIXME("%p, %s, %f.\n", iface, wine_dbgstr_longlong(systime), rate); + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - return E_NOTIMPL; + TRACE("%p, %s, %f.\n", iface, wine_dbgstr_longlong(systime), rate); + + return IMFSampleGrabberSinkCallback_OnClockSetRate(sample_grabber_get_callback(grabber), systime, rate); } static HRESULT WINAPI sample_grabber_events_QueryInterface(IMFMediaEventGenerator *iface, REFIID riid, void **obj)

1 0

Paul Gofman : ddraw: Factor out viewport_alloc_active_light_index() function.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 87a0edafbb451aaac8a1a00a18abef8fea34a45c URL: https://source.winehq.org/git/wine.git/?a=commit;h=87a0edafbb451aaac8a1a00a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jun 11 13:06:18 2019 +0300 ddraw: Factor out viewport_alloc_active_light_index() function. Signed-off-by: Paul Gofman <gofmanp(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/light.c | 6 ++--- dlls/ddraw/viewport.c | 66 +++++++++++++++++++++++++++++----------------- 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7137f78..7a1d357 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -66,6 +66,8 @@ struct FvfToDecl | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART \ | WINED3D_LEGACY_CUBEMAP_FILTERING) +#define DDRAW_MAX_ACTIVE_LIGHTS 8 + enum ddraw_device_state { DDRAW_DEVICE_STATE_OK, @@ -445,7 +447,7 @@ struct d3d_light D3DLIGHT2 light; D3DLIGHT7 light7; - DWORD dwLightIndex; + DWORD active_light_index; struct list entry; }; @@ -499,7 +501,7 @@ struct d3d_viewport /* If this viewport is active for one device, put the device here */ struct d3d_device *active_device; - DWORD num_lights; + DWORD active_lights_count; DWORD map_lights; enum ddraw_viewport_version version; diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index c6513ff..a86f046 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -39,7 +39,7 @@ static void light_update(struct d3d_light *light) if (!light->active_viewport || !light->active_viewport->active_device) return; device = light->active_viewport->active_device; - IDirect3DDevice7_SetLight(&device->IDirect3DDevice7_iface, light->dwLightIndex, &light->light7); + IDirect3DDevice7_SetLight(&device->IDirect3DDevice7_iface, light->active_light_index, &light->light7); } /***************************************************************************** @@ -61,7 +61,7 @@ void light_activate(struct d3d_light *light) light_update(light); if (light->light.dwFlags & D3DLIGHT_ACTIVE) - IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, TRUE); + IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, TRUE); } /***************************************************************************** @@ -83,7 +83,7 @@ void light_deactivate(struct d3d_light *light) device = light->active_viewport->active_device; if (light->light.dwFlags & D3DLIGHT_ACTIVE) - IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, FALSE); + IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, FALSE); } static inline struct d3d_light *impl_from_IDirect3DLight(IDirect3DLight *iface) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index daa5ac8..3172440 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -122,6 +122,34 @@ void viewport_deactivate(struct d3d_viewport *viewport) } } +static void viewport_alloc_active_light_index(struct d3d_light *light) +{ + struct d3d_viewport *vp = light->active_viewport; + unsigned int i; + DWORD map; + + TRACE("vp %p, light %p, index %u, active_lights_count %u.\n", + vp, light, light->active_light_index, vp->active_lights_count); + + if (light->active_light_index) + return; + + if (vp->active_lights_count >= DDRAW_MAX_ACTIVE_LIGHTS) + return; + + map = vp->map_lights; + + i = 0; + while (map & 1) + { + map >>= 1; + ++i; + } + light->active_light_index = i + 1; + ++vp->active_lights_count; + vp->map_lights |= 1u << i; +} + /***************************************************************************** * _dump_D3DVIEWPORT, _dump_D3DVIEWPORT2 * @@ -753,23 +781,15 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, * DDERR_INVALIDPARAMS if there are 8 lights or more * *****************************************************************************/ -static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3DLight *lpDirect3DLight) +static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *viewport, IDirect3DLight *light) { - struct d3d_viewport *This = impl_from_IDirect3DViewport3(iface); - struct d3d_light *light_impl = unsafe_impl_from_IDirect3DLight(lpDirect3DLight); - DWORD i = 0; - DWORD map = This->map_lights; + struct d3d_light *light_impl = unsafe_impl_from_IDirect3DLight(light); + struct d3d_viewport *vp = impl_from_IDirect3DViewport3(viewport); - TRACE("iface %p, light %p.\n", iface, lpDirect3DLight); + TRACE("viewport %p, light %p.\n", viewport, light); wined3d_mutex_lock(); - if (This->num_lights >= 8) - { - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; - } - if (light_impl->active_viewport) { wined3d_mutex_unlock(); @@ -777,22 +797,20 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3D return D3DERR_LIGHTHASVIEWPORT; } - /* Find a light number and update both light and viewports objects accordingly */ - while (map & 1) + light_impl->active_viewport = vp; + viewport_alloc_active_light_index(light_impl); + if (!light_impl->active_light_index) { - map >>= 1; - ++i; + light_impl->active_viewport = NULL; + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; } - light_impl->dwLightIndex = i; - This->num_lights++; - This->map_lights |= 1<<i; /* Add the light in the 'linked' chain */ - list_add_head(&This->light_list, &light_impl->entry); - IDirect3DLight_AddRef(lpDirect3DLight); + list_add_head(&vp->light_list, &light_impl->entry); + IDirect3DLight_AddRef(light); /* Attach the light to the viewport */ - light_impl->active_viewport = This; light_activate(light_impl); wined3d_mutex_unlock(); @@ -833,8 +851,8 @@ static HRESULT WINAPI d3d_viewport_DeleteLight(IDirect3DViewport3 *iface, IDirec list_remove(&l->entry); l->active_viewport = NULL; IDirect3DLight_Release(lpDirect3DLight); - --viewport->num_lights; - viewport->map_lights &= ~(1 << l->dwLightIndex); + --viewport->active_lights_count; + viewport->map_lights &= ~(1 << l->active_light_index); wined3d_mutex_unlock();

1 0

Paul Gofman : ddraw: Do not limit inactive light count in viewport.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: d864cece537a129f48445a4701ec5de8483aabe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d864cece537a129f48445a47… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jun 11 13:06:19 2019 +0300 ddraw: Do not limit inactive light count in viewport. Signed-off-by: Paul Gofman <gofmanp(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 | 3 +++ dlls/ddraw/light.c | 15 +++++++++++++-- dlls/ddraw/viewport.c | 29 ++++++++++++++++++----------- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7a1d357..e7a9c1d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -661,4 +661,7 @@ struct member_info HRESULT hr_ddraw_from_wined3d(HRESULT hr) DECLSPEC_HIDDEN; +void viewport_alloc_active_light_index(struct d3d_light *light) DECLSPEC_HIDDEN; +void viewport_free_active_light_index(struct d3d_light *light) DECLSPEC_HIDDEN; + #endif diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index a86f046..22ebe20 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -59,9 +59,14 @@ void light_activate(struct d3d_light *light) return; device = light->active_viewport->active_device; - light_update(light); if (light->light.dwFlags & D3DLIGHT_ACTIVE) + { + viewport_alloc_active_light_index(light); + if (!light->active_light_index) + return; + light_update(light); IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, TRUE); + } } /***************************************************************************** @@ -79,11 +84,17 @@ void light_deactivate(struct d3d_light *light) if (!light->active_viewport || !light->active_viewport->active_device || light->active_viewport->active_device->current_viewport != light->active_viewport) + { + assert(!light->active_light_index); return; + } device = light->active_viewport->active_device; - if (light->light.dwFlags & D3DLIGHT_ACTIVE) + if (light->active_light_index) + { IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, FALSE); + viewport_free_active_light_index(light); + } } static inline struct d3d_light *impl_from_IDirect3DLight(IDirect3DLight *iface) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 3172440..07fd197 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -122,7 +122,7 @@ void viewport_deactivate(struct d3d_viewport *viewport) } } -static void viewport_alloc_active_light_index(struct d3d_light *light) +void viewport_alloc_active_light_index(struct d3d_light *light) { struct d3d_viewport *vp = light->active_viewport; unsigned int i; @@ -150,6 +150,23 @@ static void viewport_alloc_active_light_index(struct d3d_light *light) vp->map_lights |= 1u << i; } +void viewport_free_active_light_index(struct d3d_light *light) +{ + struct d3d_viewport *vp = light->active_viewport; + + TRACE("vp %p, light %p, index %u, active_lights_count %u, map_lights %#x.\n", + vp, light, light->active_light_index, vp->active_lights_count, vp->map_lights); + + if (!light->active_light_index) + return; + + assert(vp->map_lights & (1u << (light->active_light_index - 1))); + + --vp->active_lights_count; + vp->map_lights &= ~(1u << (light->active_light_index - 1)); + light->active_light_index = 0; +} + /***************************************************************************** * _dump_D3DVIEWPORT, _dump_D3DVIEWPORT2 * @@ -798,19 +815,11 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *viewport, IDirec } light_impl->active_viewport = vp; - viewport_alloc_active_light_index(light_impl); - if (!light_impl->active_light_index) - { - light_impl->active_viewport = NULL; - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; - } /* Add the light in the 'linked' chain */ list_add_head(&vp->light_list, &light_impl->entry); IDirect3DLight_AddRef(light); - /* Attach the light to the viewport */ light_activate(light_impl); wined3d_mutex_unlock(); @@ -851,8 +860,6 @@ static HRESULT WINAPI d3d_viewport_DeleteLight(IDirect3DViewport3 *iface, IDirec list_remove(&l->entry); l->active_viewport = NULL; IDirect3DLight_Release(lpDirect3DLight); - --viewport->active_lights_count; - viewport->map_lights &= ~(1 << l->active_light_index); wined3d_mutex_unlock();

1 0

Paul Gofman : ddraw: Always activate the light when requested replacing some previous light.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 1eb6d8c58d469f46bcbcd31e27edc6850b975dc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eb6d8c58d469f46bcbcd31e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jun 11 13:06:20 2019 +0300 ddraw: Always activate the light when requested replacing some previous light. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/light.c | 2 -- dlls/ddraw/viewport.c | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 22ebe20..9c624f1 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -62,8 +62,6 @@ void light_activate(struct d3d_light *light) if (light->light.dwFlags & D3DLIGHT_ACTIVE) { viewport_alloc_active_light_index(light); - if (!light->active_light_index) - return; light_update(light); IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, TRUE); } diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 07fd197..e94c4b8 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -135,9 +135,25 @@ void viewport_alloc_active_light_index(struct d3d_light *light) return; if (vp->active_lights_count >= DDRAW_MAX_ACTIVE_LIGHTS) - return; + { + struct d3d_light *l; + + LIST_FOR_EACH_ENTRY(l, &vp->light_list, struct d3d_light, entry) + { + if (l->active_light_index) + { + WARN("Too many active lights, viewport %p, light %p, deactivating %p.\n", vp, light, l); + light_deactivate(l); + /* Recycle active lights in a FIFO way. */ + list_remove(&light->entry); + list_add_tail(&vp->light_list, &light->entry); + break; + } + } + } map = vp->map_lights; + assert(vp->active_lights_count < DDRAW_MAX_ACTIVE_LIGHTS && map != ~0u); i = 0; while (map & 1) @@ -817,7 +833,7 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *viewport, IDirec light_impl->active_viewport = vp; /* Add the light in the 'linked' chain */ - list_add_head(&vp->light_list, &light_impl->entry); + list_add_tail(&vp->light_list, &light_impl->entry); IDirect3DLight_AddRef(light); light_activate(light_impl);

1 0

Paul Gofman : ddraw/tests: Test adding a number of lights to viewport in ddraw4.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: d729c0362cf9662ccc5eafa401e833ae61b3e13b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d729c0362cf9662ccc5eafa4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jun 11 13:06:21 2019 +0300 ddraw/tests: Test adding a number of lights to viewport in ddraw4. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index fa6cca6..77ae359 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4556,6 +4556,7 @@ static void test_specular_lighting(void) {&point_far, TRUE, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, }; + IDirect3DLight *light, *dummy_lights[64]; IDirect3DVertexBuffer *src_vb, *dst_vb; struct vertex *quad, *src_data; D3DVERTEXBUFFERDESC vb_desc; @@ -4564,7 +4565,7 @@ static void test_specular_lighting(void) IDirect3DMaterial3 *material; IDirect3DDevice3 *device; IDirectDrawSurface4 *rt; - IDirect3DLight *light; + D3DLIGHT2 light_desc; IDirect3D3 *d3d; D3DCOLOR color; ULONG refcount; @@ -4635,6 +4636,22 @@ static void test_specular_lighting(void) hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memset(&light_desc, 0, sizeof(light_desc)); + light_desc.dwSize = sizeof(light_desc); + light_desc.dltType = D3DLIGHT_DIRECTIONAL; + light_desc.dwFlags = D3DLIGHT_ACTIVE; + U3(light_desc.dvDirection).z = 1.0f; + + for (i = 0; i < ARRAY_SIZE(dummy_lights); ++i) + { + hr = IDirect3D3_CreateLight(d3d, &dummy_lights[i], NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DViewport3_AddLight(viewport, dummy_lights[i]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DLight_SetLight(dummy_lights[i], (D3DLIGHT *)&light_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + hr = IDirect3D3_CreateLight(d3d, &light, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DViewport3_AddLight(viewport, light); @@ -4721,6 +4738,9 @@ static void test_specular_lighting(void) destroy_material(material); } + for (i = 0; i < ARRAY_SIZE(dummy_lights); ++i) + IDirect3DLight_Release(dummy_lights[i]); + IDirect3DVertexBuffer_Release(dst_vb); IDirect3DVertexBuffer_Release(src_vb);

1 0

Paul Gofman : ddraw: Increase maximum active light count.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 83ca9a95de80083d906a2aeb5d1e5ca2ed611199 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83ca9a95de80083d906a2aeb… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jun 11 13:06:22 2019 +0300 ddraw: Increase maximum active light count. Signed-off-by: Paul Gofman <gofmanp(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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index e7a9c1d..adfb029 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -66,7 +66,7 @@ struct FvfToDecl | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART \ | WINED3D_LEGACY_CUBEMAP_FILTERING) -#define DDRAW_MAX_ACTIVE_LIGHTS 8 +#define DDRAW_MAX_ACTIVE_LIGHTS 32 enum ddraw_device_state {

1 0

Michael Muller : ddraw: Properly set DDCAPS.ddsOldCaps in ddraw7_GetCaps() .
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 50dfd232a4f2052b767a96e7dd8ec186d15fbe69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50dfd232a4f2052b767a96e7… Author: Michael Muller <michael(a)fds-team.de> Date: Mon Jun 10 23:54:22 2019 +0430 ddraw: Properly set DDCAPS.ddsOldCaps in ddraw7_GetCaps(). Signed-off-by: David Adam <david.adam.cnrs(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 ++ dlls/ddraw/tests/ddraw1.c | 26 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 25 +++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 26 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 26 ++++++++++++++++++++++++++ 5 files changed, 105 insertions(+) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 04a94b6..8dce5ce 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1510,6 +1510,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD caps.dwCaps |= DDCAPS_ALIGNSTRIDE; caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT; + caps.ddsOldCaps.dwCaps = caps.ddsCaps.dwCaps; + if(DriverCaps) { DD_STRUCT_COPY_BYSIZE(DriverCaps, &caps); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 68428e2..860e101 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12874,6 +12874,31 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw_Release(ddraw); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -12984,4 +13009,5 @@ START_TEST(ddraw1) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d056949..2c047a5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13750,6 +13750,30 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw2 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw2_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw2_Release(ddraw); +} START_TEST(ddraw2) { @@ -13868,4 +13892,5 @@ START_TEST(ddraw2) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 823af43..fa6cca6 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16170,6 +16170,31 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw4 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw4_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -16302,4 +16327,5 @@ START_TEST(ddraw4) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e8c36dc..b0fc634 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16264,6 +16264,31 @@ static void test_begin_end_state_block(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw7 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw7_Release(ddraw); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16410,4 +16435,5 @@ START_TEST(ddraw7) test_alphatest(); test_clipper_refcount(); test_begin_end_state_block(); + test_caps(); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_enable_clip_distances().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 258f0d209db3e81f68f0a67999e10bbc6e224da1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=258f0d209db3e81f68f0a679… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 11 01:03:26 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_enable_clip_distances(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 15 ++++++++------- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/state.c | 8 +++++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 933bf13..b443fcd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2401,17 +2401,18 @@ static void wined3d_context_gl_get_rt_size(const struct wined3d_context_gl *cont size->cy = wined3d_texture_get_level_height(rt, level); } -void context_enable_clip_distances(struct wined3d_context *context, unsigned int enable_mask) +void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t enable_mask) { - const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int clip_distance_count = gl_info->limits.user_clip_distances; - unsigned int i, disable_mask, current_mask; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + unsigned int clip_distance_count, i; + uint32_t disable_mask, current_mask; + clip_distance_count = gl_info->limits.user_clip_distances; disable_mask = ~enable_mask; enable_mask &= (1u << clip_distance_count) - 1; disable_mask &= (1u << clip_distance_count) - 1; - current_mask = context->clip_distance_mask; - context->clip_distance_mask = enable_mask; + current_mask = context_gl->c.clip_distance_mask; + context_gl->c.clip_distance_mask = enable_mask; enable_mask &= ~current_mask; while (enable_mask) @@ -2850,7 +2851,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, context->last_was_rhw = TRUE; context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */ - context_enable_clip_distances(context, 0); + wined3d_context_gl_enable_clip_distances(context_gl, 0); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CLIPPING)); /* FIXME: Make draw_textured_quad() able to work with a upper left origin. */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ab62c1c..bb510ec 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10533,6 +10533,7 @@ static void shader_glsl_precompile(void *shader_priv, struct wined3d_shader *sha static void shader_glsl_select(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; @@ -10552,7 +10553,7 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex program_id = glsl_program->id; current_vertex_color_clamp = glsl_program->vs.vertex_color_clamp; if (glsl_program->shader_controlled_clip_distances) - context_enable_clip_distances(context, glsl_program->clip_distance_mask); + wined3d_context_gl_enable_clip_distances(context_gl, glsl_program->clip_distance_mask); } else { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c52e25d..2b01caa 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -693,7 +693,8 @@ void state_alpha_test(struct wined3d_context *context, const struct wined3d_stat void state_clipping(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - unsigned int enable_mask; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + uint32_t enable_mask; if (use_vs(state) && !context->d3d_info->vs_clipping) { @@ -721,7 +722,7 @@ void state_clipping(struct wined3d_context *context, const struct wined3d_state */ enable_mask = state->render_states[WINED3D_RS_CLIPPING] ? state->render_states[WINED3D_RS_CLIPPLANEENABLE] : 0; - context_enable_clip_distances(context, enable_mask); + wined3d_context_gl_enable_clip_distances(context_gl, enable_mask); } static void state_specularenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -3864,6 +3865,7 @@ static void vdecl_miscpart(struct wined3d_context *context, const struct wined3d static void vertexdeclaration(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; BOOL useVertexShaderFunction = use_vs(state); BOOL updateFog = FALSE; @@ -3940,7 +3942,7 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine /* Disable all clip planes to get defined results on all drivers. See comment in the * state_clipping state handler */ - context_enable_clip_distances(context, 0); + wined3d_context_gl_enable_clip_distances(context_gl, 0); if (!warned && state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6315738..588d7e5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2090,6 +2090,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t mask) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_statistics_query *query) DECLSPEC_HIDDEN; @@ -2249,7 +2250,6 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -void context_enable_clip_distances(struct wined3d_context *context, unsigned int mask) DECLSPEC_HIDDEN; void context_end_transform_feedback(struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_end_transform_feedback().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 6ffc6cd5d2dc3837add288a2518e4caf94b85071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ffc6cd5d2dc3837add288a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 11 01:03:27 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_end_transform_feedback(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 ++- dlls/wined3d/context.c | 14 ++++++++------ dlls/wined3d/state.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9fcd96b..8e1ac48 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -144,6 +144,7 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_resource *resource = &buffer_gl->b.resource; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -179,7 +180,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu * when deleting a potentially bound transform feedback buffer. * This may happen when the device is being destroyed. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer_gl); - context_end_transform_feedback(context); + wined3d_context_gl_end_transform_feedback(context_gl); } } } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b443fcd..18a1716 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4085,20 +4085,22 @@ static BOOL use_transform_feedback(const struct wined3d_state *state) return shader->u.gs.so_desc.element_count; } -void context_end_transform_feedback(struct wined3d_context *context) +void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; - if (context->transform_feedback_active) + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + + if (context_gl->c.transform_feedback_active) { GL_EXTCALL(glEndTransformFeedback()); checkGLcall("glEndTransformFeedback"); - context->transform_feedback_active = 0; - context->transform_feedback_paused = 0; + context_gl->c.transform_feedback_active = 0; + context_gl->c.transform_feedback_paused = 0; } } static void context_pause_transform_feedback(struct wined3d_context *context, BOOL force) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; if (!context->transform_feedback_active || context->transform_feedback_paused) @@ -4115,7 +4117,7 @@ static void context_pause_transform_feedback(struct wined3d_context *context, BO WARN("Cannot pause transform feedback operations.\n"); if (force) - context_end_transform_feedback(context); + wined3d_context_gl_end_transform_feedback(context_gl); } static void context_setup_target(struct wined3d_context *context, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2b01caa..a31f085 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4448,13 +4448,14 @@ static void state_uav_warn(struct wined3d_context *context, const struct wined3d static void state_so(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_buffer *buffer; unsigned int offset, size, i; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - context_end_transform_feedback(context); + wined3d_context_gl_end_transform_feedback(context_gl); for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 588d7e5..dad878c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2091,6 +2091,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t mask) DECLSPEC_HIDDEN; +void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_statistics_query *query) DECLSPEC_HIDDEN; @@ -2250,7 +2251,6 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -void context_end_transform_feedback(struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_map_bo_address().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: fd29561e9741b222ef55ff307f7319c59b8b1e31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd29561e9741b222ef55ff30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 11 01:03:28 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_map_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 9 ++++----- dlls/wined3d/surface.c | 31 ++++++++++++++++++++++--------- dlls/wined3d/texture.c | 18 ++++++++++++++---- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 42 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd29561e9741b222ef55…

1 0