February 2016 - Wine-commits

Henri Verbeet : ddraw: Get the texture format from the texture in d3d_device3_GetRenderState().
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 8c93a90f78582c4e88caccf1c8c5ff64bae99698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c93a90f78582c4e88caccf1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:22 2016 +0100 ddraw: Get the texture format from the texture in d3d_device3_GetRenderState(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c460658..9c88d43 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2500,17 +2500,13 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) { - struct wined3d_resource *sub_resource; + struct wined3d_resource_desc desc; - if ((sub_resource = wined3d_texture_get_sub_resource(tex, 0))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(sub_resource, &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) tex_alpha = TRUE; - } + wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); + ddfmt.dwSize = sizeof(ddfmt); + ddrawformat_from_wined3dformat(&ddfmt, desc.format); + if (ddfmt.u5.dwRGBAlphaBitMask) + tex_alpha = TRUE; } if (!(colorop == WINED3D_TOP_MODULATE

1 0

Henri Verbeet : ddraw: Get the texture format from the texture in d3d_device3_SetRenderState().
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 3c54eefaca85ae422e98c3f18c62018b7f57a81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c54eefaca85ae422e98c3f18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:23 2016 +0100 ddraw: Get the texture format from the texture in d3d_device3_SetRenderState(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9c88d43..a5b8445 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2797,17 +2797,13 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) { - struct wined3d_resource *sub_resource; + struct wined3d_resource_desc desc; - if ((sub_resource = wined3d_texture_get_sub_resource(tex, 0))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(sub_resource, &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) tex_alpha = TRUE; - } + wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); + ddfmt.dwSize = sizeof(ddfmt); + ddrawformat_from_wined3dformat(&ddfmt, desc.format); + if (ddfmt.u5.dwRGBAlphaBitMask) + tex_alpha = TRUE; } if (tex_alpha)

1 0

Henri Verbeet : ddraw: Get the texture format from the texture in d3d_device3_SetTexture().
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 3d2fb4c94847c32525f70adbe9fec55f03705568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d2fb4c94847c32525f70adbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:24 2016 +0100 ddraw: Get the texture format from the texture in d3d_device3_SetTexture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a5b8445..2474e49 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4723,17 +4723,13 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) { - struct wined3d_resource *sub_resource; + struct wined3d_resource_desc desc; - if ((sub_resource = wined3d_texture_get_sub_resource(tex, 0))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(sub_resource, &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) tex_alpha = TRUE; - } + wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); + ddfmt.dwSize = sizeof(ddfmt); + ddrawformat_from_wined3dformat(&ddfmt, desc.format); + if (ddfmt.u5.dwRGBAlphaBitMask) + tex_alpha = TRUE; } /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_get_sub_resource_desc() .
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 0287d75ce76c845507b5a9d811d762e22fe4759e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0287d75ce76c845507b5a9d81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:25 2016 +0100 wined3d: Introduce wined3d_texture_get_sub_resource_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 15 +++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 76cdc72..ea19a2d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1553,6 +1553,37 @@ void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *textu texture->sub_resources[sub_resource_idx].resource->parent = parent; } +HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc) +{ + unsigned int sub_count = texture->level_count * texture->layer_count; + const struct wined3d_resource *resource; + unsigned int level_idx; + + TRACE("texture %p, sub_resource_idx %u, desc %p.\n", texture, sub_resource_idx, desc); + + if (sub_resource_idx >= sub_count) + { + WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + return WINED3DERR_INVALIDCALL; + } + + resource = &texture->resource; + desc->format = resource->format->id; + desc->multisample_type = resource->multisample_type; + desc->multisample_quality = resource->multisample_quality; + desc->usage = resource->usage; + desc->pool = resource->pool; + + level_idx = sub_resource_idx % texture->level_count; + desc->width = max(1, resource->width >> level_idx); + desc->height = max(1, resource->height >> level_idx); + desc->depth = max(1, resource->depth >> level_idx); + desc->size = texture->sub_resources[sub_resource_idx].resource->size; + + return WINED3D_OK; +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0d6ce42..5e2e426 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -251,6 +251,7 @@ @ cdecl wined3d_texture_get_pitch(ptr long ptr ptr) @ cdecl wined3d_texture_get_resource(ptr) @ cdecl wined3d_texture_get_sub_resource(ptr long) +@ cdecl wined3d_texture_get_sub_resource_desc(ptr long ptr) @ cdecl wined3d_texture_get_sub_resource_parent(ptr long) @ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_preload(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b892102..1af0d52 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1635,6 +1635,19 @@ struct wined3d_resource_desc UINT size; }; +struct wined3d_sub_resource_desc +{ + enum wined3d_format_id format; + enum wined3d_multisample_type multisample_type; + UINT multisample_quality; + DWORD usage; + enum wined3d_pool pool; + UINT width; + UINT height; + UINT depth; + UINT size; +}; + struct wined3d_clip_status { DWORD clip_union; @@ -2447,6 +2460,8 @@ void __cdecl wined3d_texture_get_pitch(const struct wined3d_texture *texture, struct wined3d_resource * __cdecl wined3d_texture_get_resource(struct wined3d_texture *texture); struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, UINT sub_resource_idx); +HRESULT __cdecl wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc); void * __cdecl wined3d_texture_get_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx); ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); void __cdecl wined3d_texture_preload(struct wined3d_texture *texture);

1 0

Henri Verbeet : ddraw: Use wined3d_texture_get_sub_resource_desc() in ddraw_surface_create().
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 48580ccd42ff99a732939d9d6d19d9e592a03041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48580ccd42ff99a732939d9d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:26 2016 +0100 ddraw: Use wined3d_texture_get_sub_resource_desc() in ddraw_surface_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 78d3b11..e9c9c65 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5686,10 +5686,10 @@ static HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) { - struct wined3d_resource_desc wined3d_desc, wined3d_mip_desc; + struct wined3d_sub_resource_desc wined3d_mip_desc; struct ddraw_surface *root, *mip, **attach; + struct wined3d_resource_desc wined3d_desc; struct wined3d_texture *wined3d_texture; - struct wined3d_resource *resource; struct wined3d_display_mode mode; DDSURFACEDESC2 *desc, *mip_desc; struct ddraw_texture *texture; @@ -6145,8 +6145,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (j) { - resource = wined3d_texture_get_sub_resource(wined3d_texture, i * levels + j); - wined3d_resource_get_desc(resource, &wined3d_mip_desc); + wined3d_texture_get_sub_resource_desc(wined3d_texture, i * levels + j, &wined3d_mip_desc); mip_desc->dwWidth = wined3d_mip_desc.width; mip_desc->dwHeight = wined3d_mip_desc.height;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_device_CopyRects().
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 96120332853af77148c1958029ec17725d1342ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=96120332853af77148c195802… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:27 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_device_CopyRects(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 13de8ec..0c19b3f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1035,8 +1035,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, struct d3d8_surface *src = unsafe_impl_from_IDirect3DSurface8(src_surface); struct d3d8_surface *dst = unsafe_impl_from_IDirect3DSurface8(dst_surface); enum wined3d_format_id src_format, dst_format; - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; + struct wined3d_sub_resource_desc wined3d_desc; UINT src_w, src_h; TRACE("iface %p, src_surface %p, src_rects %p, rect_count %u, dst_surface %p, dst_points %p.\n", @@ -1046,8 +1045,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, * destination texture is in WINED3D_POOL_DEFAULT. */ wined3d_mutex_lock(); - wined3d_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &wined3d_desc); if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) { WARN("Source %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", src_surface); @@ -1058,8 +1056,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, src_w = wined3d_desc.width; src_h = wined3d_desc.height; - wined3d_resource = wined3d_texture_get_sub_resource(dst->wined3d_texture, dst->sub_resource_idx); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &wined3d_desc); if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) { WARN("Destination %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", dst_surface);

1 0

Sebastian Lackner : wined3d: Fix transposed lines in WARN message.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 85f088f252997e3f593a710ba3a0220ec8d322f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f088f252997e3f593a710ba… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 26 07:59:52 2016 +0100 wined3d: Fix transposed lines in WARN message. 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/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b7b8648..d0deff9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -486,9 +486,9 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, != render_targets[0]->resource.multisample_quality) { WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", - render_targets[0]->resource.multisample_quality, render_targets[0]->resource.multisample_type, - depth_stencil->resource.multisample_quality, depth_stencil->resource.multisample_type); + render_targets[0]->resource.multisample_quality, + depth_stencil->resource.multisample_type, depth_stencil->resource.multisample_quality); depth_stencil = NULL; } else

1 0

Sebastian Lackner : wined3d: Fix TRACE in wined3d_texture_update_desc function.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 210069d9dcd4cfeb13c4a80e7f603a7b239d03ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=210069d9dcd4cfeb13c4a80e7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 26 08:00:06 2016 +0100 wined3d: Fix TRACE in wined3d_texture_update_desc function. 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/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ea19a2d..4b24c21 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -611,7 +611,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT TRACE("texture %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u, " "mem %p, pitch %u.\n", - texture, width, height, debug_d3dformat(format_id), multisample_type, multisample_type, mem, pitch); + texture, width, height, debug_d3dformat(format_id), multisample_type, multisample_quality, mem, pitch); if (!resource_size) return WINED3DERR_INVALIDCALL;

1 0

Stefan Dösinger : wined3d: Rotate through swapchain buffers.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: d71f452c4d70a9fa6513322a5751f1eb0f46b4e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71f452c4d70a9fa6513322a5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Feb 24 22:28:08 2016 +0000 wined3d: Rotate through swapchain buffers. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 10 +++++----- dlls/d3d9/tests/visual.c | 10 +++++----- dlls/wined3d/swapchain.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 856df5d..bb644d3 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8041,9 +8041,9 @@ static void test_flip(void) /* Contents were changed. */ color = get_surface_color(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); color = get_surface_color(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); @@ -8052,15 +8052,15 @@ static void test_flip(void) ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = get_surface_color(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); color = get_surface_color(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = get_surface_color(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) IDirect3DSurface8_Release(back_buffers[i]); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 274777b..b96ccd1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20185,9 +20185,9 @@ static void test_flip(void) /* Contents were changed. */ color = getPixelColorFromSurface(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); color = getPixelColorFromSurface(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); @@ -20196,15 +20196,15 @@ static void test_flip(void) ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = getPixelColorFromSurface(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); color = getPixelColorFromSurface(back_buffers[1], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); color = getPixelColorFromSurface(back_buffers[0], 1, 1); - todo_wine ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) IDirect3DSurface9_Release(back_buffers[i]); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6e56def..becad97 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -422,6 +422,51 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, } } +/* Context activation is done by the caller. */ +static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct wined3d_context *context) +{ + struct gl_texture tex0; + GLuint rb0; + DWORD locations0; + struct wined3d_surface *surface, *surface_prev; + unsigned int i; + static const DWORD supported_locations = WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_RB_MULTISAMPLE; + + if (swapchain->desc.backbuffer_count < 2 || !swapchain->render_to_fbo) + return; + + surface_prev = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); + + /* Back buffer 0 is already in the draw binding. */ + tex0 = swapchain->back_buffers[0]->texture_rgb; + rb0 = surface_prev->rb_multisample; + locations0 = surface_prev->locations; + + for (i = 1; i < swapchain->desc.backbuffer_count; ++i) + { + surface = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[i], 0)); + + if (!(surface->locations & supported_locations)) + surface_load_location(surface, context, swapchain->back_buffers[i]->resource.draw_binding); + + swapchain->back_buffers[i - 1]->texture_rgb = swapchain->back_buffers[i]->texture_rgb; + surface_prev->rb_multisample = surface->rb_multisample; + + surface_validate_location(surface_prev, surface->locations & supported_locations); + surface_invalidate_location(surface_prev, ~(surface->locations & supported_locations)); + + surface_prev = surface; + } + + swapchain->back_buffers[i - 1]->texture_rgb = tex0; + surface_prev->rb_multisample = rb0; + + surface_validate_location(surface_prev, locations0 & supported_locations); + surface_invalidate_location(surface_prev, ~(locations0 & supported_locations)); + + device_invalidate_state(swapchain->device, STATE_FRAMEBUFFER); +} + static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, const RECT *dst_rect_in, const RGNDATA *dirty_region, DWORD flags) { @@ -549,7 +594,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT gl_info->gl_ops.gl.p_glFinish(); /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ - gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); /* TODO: cycle through the swapchain buffers */ + gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); + + wined3d_swapchain_rotate(swapchain, context); TRACE("SwapBuffers called, Starting new frame\n"); /* FPS support */

1 0

Stefan Dösinger : d3d9/tests: Test multisample flip.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: ae5931a62e1f873ce963a20cfab2bbd7524b7c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5931a62e1f873ce963a20cf… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Feb 24 22:28:09 2016 +0000 d3d9/tests: Test multisample flip. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b96ccd1..f531dc5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20211,6 +20211,51 @@ static void test_flip(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisample flip test.\n"); + goto done; + } + + present_parameters.BackBufferCount = 2; + present_parameters.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; + present_parameters.Flags = 0; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + + for (i = 0; i < present_parameters.BackBufferCount; ++i) + { + hr = IDirect3DDevice9_GetBackBuffer(device, 0, i, D3DBACKBUFFER_TYPE_MONO, &back_buffers[i]); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, back_buffers[1]); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &test_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_StretchRect(device, back_buffers[0], NULL, test_surface, NULL, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + + color = getPixelColorFromSurface(test_surface, 1, 1); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + + IDirect3DSurface9_Release(test_surface); + for (i = 0; i < present_parameters.BackBufferCount; ++i) + IDirect3DSurface9_Release(back_buffers[i]); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0