Rebase against e5ce90ed1b88bba8389aabfcb9ad0b6f837f6a14.

This commit is contained in:
Sebastian Lackner
2015-08-27 18:04:25 +02:00
parent a81dee672e
commit 33e1ccc03c
4 changed files with 13 additions and 41 deletions

View File

@@ -232,7 +232,7 @@ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device,
struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops)
{
@@ -883,8 +1006,13 @@
@@ -876,8 +999,13 @@
wined3d_texture_set_swapchain(swapchain->front_buffer, swapchain);
if (!(device->wined3d->flags & WINED3D_NO3D))
{
@@ -246,7 +246,7 @@ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
}
/* MSDN says we're only allowed a single fullscreen swapchain per device,
@@ -910,9 +1038,66 @@
@@ -903,9 +1031,66 @@
if (!(device->wined3d->flags & WINED3D_NO3D))
{