May 2017 - Wine-commits - list.winehq.org

Józef Kucia : dmusic: Fix compilation on systems that don't support nameless structs or unions.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 829ef41481c6fe1a1254f769e554e73acd98e1ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=829ef41481c6fe1a1254f769e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 11 09:35:33 2017 +0200 dmusic: Fix compilation on systems that don't support nameless structs or unions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic_private.h | 2 ++ dlls/dmusic/port.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 053d24f..8c77715 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -25,6 +25,8 @@ #include <stdarg.h> #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 5f4d918..f2f7599 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -766,18 +766,18 @@ static HRESULT WINAPI IKsControlImpl_KsProperty(IKsControl *iface, KSPROPERTY *p ULONG prop_len, void *data, ULONG data_len, ULONG *ret_len) { TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, prop, prop_len, data, data_len, ret_len); - TRACE("prop = %s - %u - %u\n", debugstr_guid(&prop->Set), prop->Id, prop->Flags); + TRACE("prop = %s - %u - %u\n", debugstr_guid(&prop->u.s.Set), prop->u.s.Id, prop->u.s.Flags); - if (prop->Flags != KSPROPERTY_TYPE_GET) + if (prop->u.s.Flags != KSPROPERTY_TYPE_GET) { - FIXME("prop flags %u not yet supported\n", prop->Flags); + FIXME("prop flags %u not yet supported\n", prop->u.s.Flags); return S_FALSE; } if (data_len < sizeof(DWORD)) return E_NOT_SUFFICIENT_BUFFER; - FIXME("Unknown property %s\n", debugstr_guid(&prop->Set)); + FIXME("Unknown property %s\n", debugstr_guid(&prop->u.s.Set)); *(DWORD*)data = FALSE; *ret_len = sizeof(DWORD);

1 0

Józef Kucia : wined3d: Disable only ARB_clip_control when ARB_viewport_array cannot be used for pixel center offsets.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 89a19317dd3d01575bf985bccfda9ee6673ba2d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a19317dd3d01575bf985bcc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 10 15:54:03 2017 +0200 wined3d: Disable only ARB_clip_control when ARB_viewport_array cannot be used for pixel center offsets. We still may want to use ARB_viewport_array, even if only for multiple viewports. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fc015a8..1de85a6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1063,8 +1063,6 @@ static void quirk_broken_arb_fog(struct wined3d_gl_info *gl_info) static void quirk_broken_viewport_subpixel_bits(struct wined3d_gl_info *gl_info) { - TRACE("Disabling ARB_viewport_array.\n"); - gl_info->supported[ARB_VIEWPORT_ARRAY] = FALSE; if (gl_info->supported[ARB_CLIP_CONTROL]) { TRACE("Disabling ARB_clip_control.\n"); @@ -4137,8 +4135,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, gl_info->gl_ops.gl.p_glGetIntegerv(GL_VIEWPORT_SUBPIXEL_BITS, &subpixel_bits); TRACE("Viewport supports %d subpixel bits.\n", subpixel_bits); - if (subpixel_bits < 8) - gl_info->supported[ARB_VIEWPORT_ARRAY] = FALSE; + if (subpixel_bits < 8 && gl_info->supported[ARB_CLIP_CONTROL]) + { + TRACE("Disabling ARB_clip_control because viewport subpixel bits < 8.\n"); + gl_info->supported[ARB_CLIP_CONTROL] = FALSE; + } } if (gl_info->supported[ARB_CLIP_CONTROL] && !gl_info->supported[ARB_VIEWPORT_ARRAY]) {

1 0

Józef Kucia : wined3d: Implement floating-point viewports.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: e14e7e32372e8b2f62778db39ab467a5528157a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e14e7e32372e8b2f62778db39… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 10 15:54:04 2017 +0200 wined3d: Implement floating-point viewports. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 ------ dlls/d3d8/device.c | 22 ++++++++++++++++++---- dlls/d3d9/device.c | 22 ++++++++++++++++++---- dlls/ddraw/device.c | 22 ++++++++++++++++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/state.c | 9 ++++++--- include/wine/wined3d.h | 8 ++++---- 7 files changed, 66 insertions(+), 27 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4284a59..df18375 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -927,12 +927,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11Devic if (!viewport_count) return; - if (viewports[0].TopLeftX != (UINT)viewports[0].TopLeftX - || viewports[0].TopLeftY != (UINT)viewports[0].TopLeftY - || viewports[0].Width != (UINT)viewports[0].Width - || viewports[0].Height != (UINT)viewports[0].Height) - FIXME("Floating-point viewports not implemented.\n"); - wined3d_vp.x = viewports[0].TopLeftX; wined3d_vp.y = viewports[0].TopLeftY; wined3d_vp.width = viewports[0].Width; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e255392..f7d05cc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1471,12 +1471,19 @@ static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface, static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3DVIEWPORT8 *viewport) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + struct wined3d_viewport vp; TRACE("iface %p, viewport %p.\n", iface, viewport); - /* Note: D3DVIEWPORT8 is compatible with struct wined3d_viewport. */ + vp.x = viewport->X; + vp.y = viewport->Y; + vp.width = viewport->Width; + vp.height = viewport->Height; + vp.min_z = viewport->MinZ; + vp.max_z = viewport->MaxZ; + wined3d_mutex_lock(); - wined3d_device_set_viewport(device->wined3d_device, (const struct wined3d_viewport *)viewport); + wined3d_device_set_viewport(device->wined3d_device, &vp); wined3d_mutex_unlock(); return D3D_OK; @@ -1485,14 +1492,21 @@ static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3D static HRESULT WINAPI d3d8_device_GetViewport(IDirect3DDevice8 *iface, D3DVIEWPORT8 *viewport) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + struct wined3d_viewport wined3d_viewport; TRACE("iface %p, viewport %p.\n", iface, viewport); - /* Note: D3DVIEWPORT8 is compatible with struct wined3d_viewport. */ wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport); + wined3d_device_get_viewport(device->wined3d_device, &wined3d_viewport); wined3d_mutex_unlock(); + viewport->X = wined3d_viewport.x; + viewport->Y = wined3d_viewport.y; + viewport->Width = wined3d_viewport.width; + viewport->Height = wined3d_viewport.height; + viewport->MinZ = wined3d_viewport.min_z; + viewport->MaxZ = wined3d_viewport.max_z; + return D3D_OK; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0cec419..cea1c9d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1885,12 +1885,19 @@ static HRESULT WINAPI d3d9_device_MultiplyTransform(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_SetViewport(IDirect3DDevice9Ex *iface, const D3DVIEWPORT9 *viewport) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_viewport vp; TRACE("iface %p, viewport %p.\n", iface, viewport); - /* Note: D3DVIEWPORT9 is compatible with struct wined3d_viewport. */ + vp.x = viewport->X; + vp.y = viewport->Y; + vp.width = viewport->Width; + vp.height = viewport->Height; + vp.min_z = viewport->MinZ; + vp.max_z = viewport->MaxZ; + wined3d_mutex_lock(); - wined3d_device_set_viewport(device->wined3d_device, (const struct wined3d_viewport *)viewport); + wined3d_device_set_viewport(device->wined3d_device, &vp); wined3d_mutex_unlock(); return D3D_OK; @@ -1899,14 +1906,21 @@ static HRESULT WINAPI d3d9_device_SetViewport(IDirect3DDevice9Ex *iface, const D static HRESULT WINAPI d3d9_device_GetViewport(IDirect3DDevice9Ex *iface, D3DVIEWPORT9 *viewport) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_viewport wined3d_viewport; TRACE("iface %p, viewport %p.\n", iface, viewport); - /* Note: D3DVIEWPORT9 is compatible with struct wined3d_viewport. */ wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport); + wined3d_device_get_viewport(device->wined3d_device, &wined3d_viewport); wined3d_mutex_unlock(); + viewport->X = wined3d_viewport.x; + viewport->Y = wined3d_viewport.y; + viewport->Width = wined3d_viewport.width; + viewport->Height = wined3d_viewport.height; + viewport->MinZ = wined3d_viewport.min_z; + viewport->MaxZ = wined3d_viewport.max_z; + return D3D_OK; } diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 772ce3e..6a6c19c 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5303,15 +5303,22 @@ static HRESULT WINAPI d3d_device7_Clear_FPUPreserve(IDirect3DDevice7 *iface, DWO static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_viewport vp; TRACE("iface %p, viewport %p.\n", iface, viewport); if (!viewport) return DDERR_INVALIDPARAMS; - /* Note: D3DVIEWPORT7 is compatible with struct wined3d_viewport. */ + vp.x = viewport->dwX; + vp.y = viewport->dwY; + vp.width = viewport->dwWidth; + vp.height = viewport->dwHeight; + vp.min_z = viewport->dvMinZ; + vp.max_z = viewport->dvMaxZ; + wined3d_mutex_lock(); - wined3d_device_set_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport); + wined3d_device_set_viewport(device->wined3d_device, &vp); wined3d_mutex_unlock(); return D3D_OK; @@ -5352,17 +5359,24 @@ static HRESULT WINAPI d3d_device7_SetViewport_FPUPreserve(IDirect3DDevice7 *ifac static HRESULT d3d_device7_GetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_viewport wined3d_viewport; TRACE("iface %p, viewport %p.\n", iface, viewport); if (!viewport) return DDERR_INVALIDPARAMS; - /* Note: D3DVIEWPORT7 is compatible with struct wined3d_viewport. */ wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport); + wined3d_device_get_viewport(device->wined3d_device, &wined3d_viewport); wined3d_mutex_unlock(); + viewport->dwX = wined3d_viewport.x; + viewport->dwY = wined3d_viewport.y; + viewport->dwWidth = wined3d_viewport.width; + viewport->dwHeight = wined3d_viewport.height; + viewport->dvMinZ = wined3d_viewport.min_z; + viewport->dvMaxZ = wined3d_viewport.max_z; + return D3D_OK; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2637411..9aea4f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1887,7 +1887,7 @@ INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *devi void CDECL wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport) { TRACE("device %p, viewport %p.\n", device, viewport); - TRACE("x %u, y %u, w %u, h %u, min_z %.8e, max_z %.8e.\n", + TRACE("x %.8e, y %.8e, w %.8e, h %.8e, min_z %.8e, max_z %.8e.\n", viewport->x, viewport->y, viewport->width, viewport->height, viewport->min_z, viewport->max_z); device->update_state->viewport = *viewport; @@ -3082,7 +3082,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO /* Get the viewport */ wined3d_device_get_viewport(device, &vp); - TRACE("viewport x %u, y %u, width %u, height %u, min_z %.8e, max_z %.8e.\n", + TRACE("viewport x %.8e, y %.8e, width %.8e, height %.8e, min_z %.8e, max_z %.8e.\n", vp.x, vp.y, vp.width, vp.height, vp.min_z, vp.max_z); multiply_matrix(&mat,&view_mat,&world_mat); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b36c0fd..ad063fe 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4598,6 +4598,7 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_viewport vp = state->viewport; unsigned int width, height; + float y; if (target) { @@ -4623,10 +4624,12 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine checkGLcall("glDepthRange"); /* Note: GL requires lower left, DirectX supplies upper left. This is * reversed when using offscreen rendering. */ - if (context->render_offscreen) - gl_info->gl_ops.gl.p_glViewport(vp.x, vp.y, vp.width, vp.height); + y = context->render_offscreen ? vp.y : height - (vp.y + vp.height); + + if (gl_info->supported[ARB_VIEWPORT_ARRAY]) + GL_EXTCALL(glViewportIndexedf(0, vp.x, y, vp.width, vp.height)); else - gl_info->gl_ops.gl.p_glViewport(vp.x, (height - (vp.y + vp.height)), vp.width, vp.height); + gl_info->gl_ops.gl.p_glViewport(vp.x, y, vp.width, vp.height); checkGLcall("glViewport"); } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0bf3e55..2966d5e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1619,10 +1619,10 @@ struct wined3d_material struct wined3d_viewport { - UINT x; - UINT y; - UINT width; - UINT height; + float x; + float y; + float width; + float height; float min_z; float max_z; };

1 0

Józef Kucia : d3d11/tests: Add test for fractional viewports.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: e3d69b558010f1c93e7747732c56f2de52f64f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3d69b558010f1c93e7747732… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 10 15:54:05 2017 +0200 d3d11/tests: Add test for fractional viewports. The todo_wine() is required mainly because of the pixel center offset applied to viewport/gl_Position. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 169 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a595bec..22de6d5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -17729,6 +17729,174 @@ done: release_test_context(&test_context); } +static void test_fractional_viewports(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11InputLayout *input_layout; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11RenderTargetView *rtv; + ID3D11VertexShader *vs; + ID3D11PixelShader *ps; + unsigned int i, x, y; + ID3D11Device *device; + ID3D11Texture2D *rt; + UINT offset, stride; + D3D11_VIEWPORT vp; + ID3D11Buffer *vb; + HRESULT hr; + + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const DWORD vs_code[] = + { +#if 0 + void main(in float4 in_position : POSITION, + in float2 in_texcoord : TEXCOORD, + out float4 position : SV_Position, + out float2 texcoord : TEXCOORD) + { + position = in_position; + texcoord = in_texcoord; + } +#endif + 0x43425844, 0x4df282ca, 0x85c8bbfc, 0xd44ad19f, 0x1158be97, 0x00000001, 0x00000148, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d8, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x49534f50, 0x4e4f4954, 0x58455400, 0x524f4f43, 0xabab0044, + 0x4e47534f, 0x00000050, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000c03, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, 0xababab00, 0x52444853, 0x00000068, + 0x00010040, 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101032, 0x00000001, + 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x00102032, 0x00000001, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102032, 0x00000001, 0x00101046, + 0x00000001, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + float4 main(float4 position : SV_Position, + float2 texcoord : TEXCOORD) : SV_Target + { + return float4(position.xy, texcoord); + } +#endif + 0x43425844, 0xa15616bc, 0x6862ab1c, 0x28b915c0, 0xdb0df67c, 0x00000001, 0x0000011c, 0x00000003, + 0x0000002c, 0x00000084, 0x000000b8, 0x4e475349, 0x00000050, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, + 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000005c, + 0x00000040, 0x00000017, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03001062, 0x00101032, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00101046, + 0x00000000, 0x05000036, 0x001020c2, 0x00000000, 0x00101406, 0x00000001, 0x0100003e, + }; + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const struct + { + struct vec2 position; + struct vec2 texcoord; + } + quad[] = + { + {{-1.0f, -1.0f}, {0.0f, 0.0f}}, + {{-1.0f, 1.0f}, {0.0f, 1.0f}}, + {{ 1.0f, -1.0f}, {1.0f, 0.0f}}, + {{ 1.0f, 1.0f}, {1.0f, 1.0f}}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const float viewport_offsets[] = + { + 0.0f, 0.5f, 0.25f, 0.125f, 0.0625f, 0.03125f, 0.015625f, 0.0078125f, 0.00390625f, + 1.0f / 128.0f, 63.0f / 128.0f, + }; + + if (!init_test_context(&test_context, &feature_level)) + return; + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 4; + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(quad), quad); + + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + for (i = 0; i < ARRAY_SIZE(viewport_offsets); ++i) + { + vp.TopLeftX = viewport_offsets[i]; + vp.TopLeftY = viewport_offsets[i]; + vp.Width = texture_desc.Width; + vp.Height = texture_desc.Height; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, white); + ID3D11DeviceContext_Draw(context, 4, 0); + get_texture_readback(rt, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) + { + for (x = 0; x < texture_desc.Width; ++x) + { + const struct vec4 *v = get_readback_vec4(&rb, x, y); + struct vec4 expected = {x + 0.5f, y + 0.5f, + (x + 0.5f - viewport_offsets[i]) / texture_desc.Width, + 1.0f - (y + 0.5f - viewport_offsets[i]) / texture_desc.Height}; + ok(compare_float(v->x, expected.x, 0) && compare_float(v->y, expected.y, 0), + "Got fragcoord {%.8e, %.8e}, expected {%.8e, %.8e} at (%u, %u), offset %.8e.\n", + v->x, v->y, expected.x, expected.y, x, y, viewport_offsets[i]); + todo_wine + ok(compare_float(v->z, expected.z, 2) && compare_float(v->w, expected.w, 2), + "Got texcoord {%.8e, %.8e}, expected {%.8e, %.8e} at (%u, %u), offset %.8e.\n", + v->z, v->w, expected.z, expected.w, x, y, viewport_offsets[i]); + } + } + release_resource_readback(&rb); + } + + ID3D11InputLayout_Release(input_layout); + ID3D11Buffer_Release(vb); + ID3D11VertexShader_Release(vs); + ID3D11PixelShader_Release(ps); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(rt); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -17818,4 +17986,5 @@ START_TEST(d3d11) test_fl10_stream_output_desc(); test_stream_output_resume(); test_gather(); + test_fractional_viewports(); }

1 0

Józef Kucia : wined3d: Make "value" optional in wined3d_device_get_predication().
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: febf242ff5350842b1e98e9ca29948f1db7a3e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=febf242ff5350842b1e98e9ca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 10 15:54:06 2017 +0200 wined3d: Make "value" optional in wined3d_device_get_predication(). Signed-off-by: Józef Kucia <jkucia(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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9aea4f2..4b4baee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3620,7 +3620,8 @@ struct wined3d_query * CDECL wined3d_device_get_predication(struct wined3d_devic { TRACE("device %p, value %p.\n", device, value); - *value = device->state.predicate_value; + if (value) + *value = device->state.predicate_value; return device->state.predicate; }

1 0

Józef Kucia : wined3d: Add "parent_ops" for query objects.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 6c5a90e193405b9d3fbf510c17f09e720394d775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5a90e193405b9d3fbf510c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 10 15:54:07 2017 +0200 wined3d: Add "parent_ops" for query objects. In order to implement proper refcounting for d3d11_immediate_context_SetPredication(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 32 ++++++++++++++++++++---- dlls/d3d9/d3d9_private.h | 4 ++- dlls/d3d9/device.c | 2 +- dlls/d3d9/query.c | 3 ++- dlls/wined3d/query.c | 55 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 4 +-- 8 files changed, 71 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c5a90e193405b9d3fbf5…

1 0

Józef Kucia : d3d11/tests: Add test for predication state refcounting.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 6f11fd9728d4490294e33360b57f52303eda5446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f11fd9728d4490294e33360b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 10 15:54:08 2017 +0200 d3d11/tests: Add test for predication state refcounting. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 22de6d5..6626ea2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5227,11 +5227,13 @@ static void test_private_data(void) static void test_state_refcounting(const D3D_FEATURE_LEVEL feature_level) { ID3D11RasterizerState *rasterizer_state, *tmp_rasterizer_state; + ID3D11Predicate *predicate, *tmp_predicate; ID3D11SamplerState *sampler, *tmp_sampler; ID3D11ShaderResourceView *srv, *tmp_srv; ID3D11RenderTargetView *rtv, *tmp_rtv; D3D11_RASTERIZER_DESC rasterizer_desc; D3D11_TEXTURE2D_DESC texture_desc; + D3D11_QUERY_DESC predicate_desc; D3D11_SAMPLER_DESC sampler_desc; struct device_desc device_desc; ID3D11DeviceContext *context; @@ -5340,6 +5342,23 @@ static void test_state_refcounting(const D3D_FEATURE_LEVEL feature_level) refcount = ID3D11RenderTargetView_Release(tmp_rtv); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + /* ID3D11Predicate */ + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + predicate_desc.Query = D3D11_QUERY_OCCLUSION_PREDICATE; + predicate_desc.MiscFlags = 0; + hr = ID3D11Device_CreatePredicate(device, &predicate_desc, &predicate); + ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); + + ID3D11DeviceContext_SetPredication(context, predicate, TRUE); + refcount = ID3D11Predicate_Release(predicate); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + ID3D11DeviceContext_GetPredication(context, &tmp_predicate, NULL); + ok(tmp_predicate == predicate, "Got predicate %p, expected %p.\n", tmp_predicate, predicate); + refcount = ID3D11Predicate_Release(tmp_predicate); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + } + ID3D11DeviceContext_Release(context); refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Sebastian Lackner : wined3d: Shutdown CS thread before deallocating resources.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 564170cbd0fda01e1c4f03cf5fcfbdb2813785af URL: http://source.winehq.org/git/wine.git/?a=commit;h=564170cbd0fda01e1c4f03cf5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed May 10 20:00:43 2017 +0200 wined3d: Shutdown CS thread before deallocating resources. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 91a99b7..d1d654c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2561,10 +2561,6 @@ fail: void wined3d_cs_destroy(struct wined3d_cs *cs) { - state_cleanup(&cs->state); - HeapFree(GetProcessHeap(), 0, cs->fb.render_targets); - HeapFree(GetProcessHeap(), 0, cs->data); - if (cs->thread) { wined3d_cs_emit_stop(cs); @@ -2573,5 +2569,8 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) ERR("Closing event failed.\n"); } + state_cleanup(&cs->state); + HeapFree(GetProcessHeap(), 0, cs->fb.render_targets); + HeapFree(GetProcessHeap(), 0, cs->data); HeapFree(GetProcessHeap(), 0, cs); }

1 0

Hans Leidekker : iphlpapi: Adapter names returned from GetAdaptersAddresses are GUID strings.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 98f77c4f7cca819ba7425def081bd334f86b52d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98f77c4f7cca819ba7425def0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 11 10:15:26 2017 +0200 iphlpapi: Adapter names returned from GetAdaptersAddresses are GUID strings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 9 +++++---- dlls/iphlpapi/tests/iphlpapi.c | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b40f91b..796950e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -978,7 +978,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index } total_size = sizeof(IP_ADAPTER_ADDRESSES); - total_size += IF_NAMESIZE; + total_size += 39; /* "{00000000-0000-0000-0000-000000000000}" */ total_size += IF_NAMESIZE * sizeof(WCHAR); if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) total_size += IF_NAMESIZE * sizeof(WCHAR); @@ -1009,10 +1009,11 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index aa->u.s.Length = sizeof(IP_ADAPTER_ADDRESSES); aa->u.s.IfIndex = index; - getInterfaceNameByIndex(index, name); - memcpy(ptr, name, IF_NAMESIZE); + sprintf(ptr, "{%08x-0000-0000-0000-000000000000}", index); aa->AdapterName = ptr; - ptr += IF_NAMESIZE; + ptr += 39; + + getInterfaceNameByIndex(index, name); if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) { aa->FriendlyName = (WCHAR *)ptr; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 9deccc2..5fb23fb 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1414,8 +1414,10 @@ static void test_GetAdaptersAddresses(void) for (aa = ptr; !ret && aa; aa = aa->Next) { - char temp[128]; + char temp[128], buf[39]; IP_ADAPTER_PREFIX *prefix; + DWORD status; + GUID guid; ok(S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_LH) || S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_XP), @@ -1524,6 +1526,17 @@ static void test_GetAdaptersAddresses(void) trace("Dhcpv6Iaid: %u\n", aa->Dhcpv6Iaid); trace("FirstDnsSuffix: %p\n", aa->FirstDnsSuffix); trace("\n"); + + if (pConvertInterfaceLuidToGuid) + { + status = pConvertInterfaceLuidToGuid(&aa->Luid, &guid); + ok(!status, "got %u\n", status); + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); + ok(!strcasecmp(aa->AdapterName, buf), "expected '%s' got '%s'\n", aa->AdapterName, buf); + } } HeapFree(GetProcessHeap(), 0, ptr); }

1 0

Michael Stefaniuc : dmime/tests: Add refcount test for generated dmusic/ dsound.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 195280bee3f090b4b09458cd0e7ab476c8d8ba1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=195280bee3f090b4b09458cd0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:44 2017 +0200 dmime/tests: Add refcount test for generated dmusic/dsound. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 730ec52..9187c81 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -122,6 +122,18 @@ static HRESULT test_InitAudio(void) ok(hr == S_OK, "InitAudio failed: %08x\n", hr); destroy_performance(performance, NULL, NULL); + /* Refcounts for auto generated dmusic and dsound */ + create_performance(&performance, NULL, NULL, FALSE); + dmusic = NULL; + dsound = NULL; + hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ref = get_refcount(dmusic); + ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + destroy_performance(performance, NULL, NULL); + /* dsound without SetCooperativeLevel() */ create_performance(&performance, NULL, &dsound, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL);

1 0