wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against a65718a3e7b95443a82dafd5d2c9cded961404a6.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-08-04 03:33:52 +02:00
parent 3aa3a625e3
commit 2260ec5633
6 changed files with 188 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch
View File

@ -1,4 +1,4 @@
From a1b20acdf908d93184138869d1fc105c133498ef Mon Sep 17 00:00:00 2001
From 0f19391f2d2b5478137635a66a560bb9e097075a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 12 Apr 2016 01:02:34 +0200
Subject: uiautomationcore: Add dll and stub some functions.
@ -15,12 +15,12 @@ Subject: uiautomationcore: Add dll and stub some functions.
create mode 100644 dlls/uiautomationcore/uiautomationcore.spec
diff --git a/configure.ac b/configure.ac
index 39097d1..896d413 100644
index 4cfcdb1..9e8bbb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3304,6 +3304,7 @@ WINE_CONFIG_TEST(dlls/twain_32/tests)
@@ -3314,6 +3314,7 @@ WINE_CONFIG_TEST(dlls/twain_32/tests)
WINE_CONFIG_DLL(typelib.dll16,enable_win16)
WINE_CONFIG_DLL(ucrtbase)
WINE_CONFIG_DLL(ucrtbase,,[implib])
WINE_CONFIG_TEST(dlls/ucrtbase/tests)
+WINE_CONFIG_DLL(uiautomationcore)
WINE_CONFIG_DLL(unicows,,[implib])
@ -307,5 +307,5 @@ index 340f500..b9107ce 100644
#ifdef __cplusplus
}
--
2.7.1
2.9.0

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "9ef65cf3d6af2e488d7efcb94fe61aa7e8540351"
echo "a65718a3e7b95443a82dafd5d2c9cded961404a6"
}
# Show version information

109
patches/wined3d-CSMT_Main/0003-wined3d-Call-texture_load_location-instead-of-surfac.patch
View File

@ -1,17 +1,17 @@
From 5fa9c86a97fe07adf65c2c7dfdbb44522b31ad33 Mon Sep 17 00:00:00 2001
From 0de3c15670f2fa6a665f75a77ae522456372ed9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Tue, 17 Nov 2015 23:13:29 -0800
Subject: wined3d: Call texture_load_location instead of surface_load_location.
---
dlls/wined3d/device.c | 9 ++++++---
dlls/wined3d/surface.c | 32 ++++++++++++++++++++------------
dlls/wined3d/swapchain.c | 8 ++++----
dlls/wined3d/texture.c | 2 +-
4 files changed, 31 insertions(+), 20 deletions(-)
dlls/wined3d/device.c | 9 ++++++---
dlls/wined3d/surface.c | 8 +++++---
dlls/wined3d/swapchain.c | 8 ++++----
dlls/wined3d/texture.c | 2 +-
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 727abe6..afd4616 100644
index e052557..604be94 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -203,12 +203,15 @@ void device_switch_onscreen_ds(struct wined3d_device *device,
@ -42,33 +42,10 @@ index 727abe6..afd4616 100644
}
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 2e1b97b..82d1ebd 100644
index 859f481..6d5b22b 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -545,9 +545,11 @@ static void surface_blt_fbo(const struct wined3d_device *device,
* surface isn't required if the entire surface is overwritten. (And is
* in fact harmful if we're being called by surface_load_location() with
* the purpose of loading the destination surface.) */
- surface_load_location(src_surface, old_ctx, src_location);
+ wined3d_texture_load_location(src_surface->container, surface_get_sub_resource_idx(src_surface),
+ old_ctx, src_location);
if (!surface_is_full_rect(dst_surface, &dst_rect))
- surface_load_location(dst_surface, old_ctx, dst_location);
+ wined3d_texture_load_location(dst_surface->container, surface_get_sub_resource_idx(dst_surface),
+ old_ctx, dst_location);
else
wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location);
@@ -1187,7 +1189,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
if (update_w == dst_w && update_h == dst_h)
wined3d_texture_prepare_texture(dst_texture, context, FALSE);
else
- surface_load_location(dst_surface, context, WINED3D_LOCATION_TEXTURE_RGB);
+ wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB);
wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE);
wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data,
@@ -2446,7 +2448,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device,
@@ -2447,7 +2447,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device,
gl_info = context->gl_info;
/* Make sure the surface is up-to-date. This should probably use
@ -77,65 +54,7 @@ index 2e1b97b..82d1ebd 100644
* unless we're overwriting it completely. */
wined3d_texture_load(src_texture, context, FALSE);
@@ -2944,7 +2946,8 @@ static void surface_load_sysmem(struct wined3d_surface *surface,
}
if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED))
- surface_load_location(surface, context, WINED3D_LOCATION_TEXTURE_RGB);
+ wined3d_texture_load_location(surface->container, surface_get_sub_resource_idx(surface),
+ context, WINED3D_LOCATION_TEXTURE_RGB);
/* Download the surface to system memory. */
if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB))
@@ -2982,7 +2985,8 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface,
}
surface_get_rect(surface, NULL, &r);
- surface_load_location(surface, context, WINED3D_LOCATION_TEXTURE_RGB);
+ wined3d_texture_load_location(texture, surface_get_sub_resource_idx(surface),
+ context, WINED3D_LOCATION_TEXTURE_RGB);
surface_blt_to_drawable(texture->resource.device, context,
WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r);
@@ -3059,7 +3063,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
== WINED3D_LOCATION_TEXTURE_RGB)
{
FIXME_(d3d_perf)("Downloading RGB surface %p to reload it as sRGB.\n", surface);
- surface_load_location(surface, context, texture->resource.map_binding);
+ wined3d_texture_load_location(texture, surface_get_sub_resource_idx(surface),
+ context, texture->resource.map_binding);
}
}
else
@@ -3068,7 +3073,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
== WINED3D_LOCATION_TEXTURE_SRGB)
{
FIXME_(d3d_perf)("Downloading sRGB surface %p to reload it as RGB.\n", surface);
- surface_load_location(surface, context, texture->resource.map_binding);
+ wined3d_texture_load_location(texture, surface_get_sub_resource_idx(surface),
+ context, texture->resource.map_binding);
}
}
@@ -3076,7 +3082,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
{
WARN("Trying to load a texture from sysmem, but no simple location is valid.\n");
/* Lets hope we get it from somewhere... */
- surface_load_location(surface, context, WINED3D_LOCATION_SYSMEM);
+ wined3d_texture_load_location(texture, surface_get_sub_resource_idx(surface), context, WINED3D_LOCATION_SYSMEM);
}
wined3d_texture_prepare_texture(texture, context, srgb);
@@ -3094,7 +3100,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
{
TRACE("Removing the pbo attached to surface %p.\n", surface);
- surface_load_location(surface, context, WINED3D_LOCATION_SYSMEM);
+ wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM);
wined3d_texture_set_map_binding(texture, WINED3D_LOCATION_SYSMEM);
}
@@ -3223,7 +3229,8 @@ void surface_load_location(struct wined3d_surface *surface, struct wined3d_conte
@@ -3225,7 +3225,8 @@ void surface_load_location(struct wined3d_surface *surface, struct wined3d_conte
{
ERR("Surface %p does not have any up to date location.\n", surface);
wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED);
@ -145,7 +64,7 @@ index 2e1b97b..82d1ebd 100644
}
if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)
@@ -4378,7 +4385,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
@@ -4380,7 +4381,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
if (!wined3d_resource_is_offscreen(&dst_texture->resource))
{
struct wined3d_context *context = context_acquire(device, dst_surface);
@ -156,10 +75,10 @@ index 2e1b97b..82d1ebd 100644
}
return WINED3D_OK;
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 306c499..7000bc2 100644
index 4d7f60a..6f3b4d8 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -457,7 +457,7 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct
@@ -464,7 +464,7 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct
sub_resource = &texture->sub_resources[0];
if (!(sub_resource->locations & supported_locations))
@ -168,7 +87,7 @@ index 306c499..7000bc2 100644
texture_prev->texture_rgb = texture->texture_rgb;
texture_prev->rb_multisample = texture->rb_multisample;
@@ -637,12 +637,12 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain,
@@ -644,12 +644,12 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain,
static void swapchain_gl_frontbuffer_updated(struct wined3d_swapchain *swapchain)
{

18
patches/wined3d-CSMT_Main/0004-wined3d-Share-surface-and-volume-system-memory-loadi.patch
View File

@ -1,4 +1,4 @@
From 2b5e06e34805da8a6c3f9f16415ec7f026c247d3 Mon Sep 17 00:00:00 2001
From 8aa63bc1c917384f24353625459d8381d2474e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Wed, 18 Nov 2015 08:31:14 +0000
Subject: wined3d: Share surface and volume system memory loading code.
@ -9,10 +9,10 @@ Subject: wined3d: Share surface and volume system memory loading code.
2 files changed, 124 insertions(+), 155 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 105fcb5..2933b82 100644
index 6d5b22b..5805557 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2869,67 +2869,6 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win
@@ -2865,67 +2865,6 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win
}
}
@ -80,7 +80,7 @@ index 105fcb5..2933b82 100644
/* Context activation is done by the caller. */
static void surface_load_sysmem(struct wined3d_surface *surface,
struct wined3d_context *context, DWORD dst_location)
@@ -2942,12 +2881,6 @@ static void surface_load_sysmem(struct wined3d_surface *surface,
@@ -2938,12 +2877,6 @@ static void surface_load_sysmem(struct wined3d_surface *surface,
wined3d_texture_prepare_location(texture, sub_resource_idx, context, dst_location);
sub_resource = &texture->sub_resources[sub_resource_idx];
@ -91,9 +91,9 @@ index 105fcb5..2933b82 100644
- }
-
if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED))
wined3d_texture_load_location(surface->container, surface_get_sub_resource_idx(surface),
context, WINED3D_LOCATION_TEXTURE_RGB);
@@ -3195,46 +3128,11 @@ void surface_load_location(struct wined3d_surface *surface, struct wined3d_conte
wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB);
@@ -3188,46 +3121,11 @@ void surface_load_location(struct wined3d_surface *surface, struct wined3d_conte
unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface);
struct wined3d_texture *texture = surface->container;
struct wined3d_texture_sub_resource *sub_resource;
@ -140,7 +140,7 @@ index 105fcb5..2933b82 100644
if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)
{
@@ -3281,14 +3179,6 @@ void surface_load_location(struct wined3d_surface *surface, struct wined3d_conte
@@ -3274,14 +3172,6 @@ void surface_load_location(struct wined3d_surface *surface, struct wined3d_conte
}
done:
@ -156,7 +156,7 @@ index 105fcb5..2933b82 100644
}
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index f4c50d2..5bbeab6 100644
index 2d155cb..40d333f 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -80,27 +80,6 @@ GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture)

22
patches/wined3d-CSMT_Main/0020-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch
View File

@ -1,4 +1,4 @@
From 93e6c6e06461428cb9250bb04693e870cf1970b1 Mon Sep 17 00:00:00 2001
From 2b155ebd27175664ee670e0213dff7295c3fbdff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Thu, 4 Apr 2013 14:52:24 +0200
Subject: wined3d: Pass the depth stencil to swapchain->present
@ -12,10 +12,10 @@ DS or the implicit DS.
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 02489fd..524fb45 100644
index 095fa0e..cacafec 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -442,7 +442,8 @@ static UINT wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data)
@@ -457,7 +457,8 @@ static UINT wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data)
swapchain = op->swapchain;
wined3d_swapchain_set_window(swapchain, op->dst_window_override);
@ -26,10 +26,10 @@ index 02489fd..524fb45 100644
wined3d_resource_release(&swapchain->front_buffer->resource);
for (i = 0; i < swapchain->desc.backbuffer_count; ++i)
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index cb4d8b8..253ad66 100644
index c920919..33908dc 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -478,10 +478,10 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct
@@ -485,10 +485,10 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct
}
static void swapchain_gl_present(struct wined3d_swapchain *swapchain,
@ -42,7 +42,7 @@ index cb4d8b8..253ad66 100644
const struct wined3d_gl_info *gl_info;
struct wined3d_texture *logo_texture;
struct wined3d_context *context;
@@ -617,15 +617,15 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain,
@@ -624,15 +624,15 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain,
wined3d_texture_validate_location(swapchain->back_buffers[swapchain->desc.backbuffer_count - 1],
0, WINED3D_LOCATION_DISCARDED);
@ -52,7 +52,7 @@ index cb4d8b8..253ad66 100644
- struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(fb->depth_stencil);
+ struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(depth_stencil);
if (ds && (swapchain->desc.flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL
if (ds && (swapchain->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL
|| ds->container->flags & WINED3D_TEXTURE_DISCARD))
{
surface_modify_ds_location(ds, WINED3D_LOCATION_DISCARDED,
@ -61,7 +61,7 @@ index cb4d8b8..253ad66 100644
if (ds == swapchain->device->onscreen_depth_stencil)
{
wined3d_texture_decref(swapchain->device->onscreen_depth_stencil->container);
@@ -698,7 +698,8 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai
@@ -705,7 +705,8 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai
}
static void swapchain_gdi_present(struct wined3d_swapchain *swapchain,
@ -72,10 +72,10 @@ index cb4d8b8..253ad66 100644
struct wined3d_surface *front, *back;
HBITMAP bitmap;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 9089724..a6b6f80 100644
index f79a792..ed335d1 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3216,7 +3216,8 @@ struct wined3d_unordered_access_view
@@ -3239,7 +3239,8 @@ struct wined3d_unordered_access_view
struct wined3d_swapchain_ops
{
void (*swapchain_present)(struct wined3d_swapchain *swapchain,
@ -86,5 +86,5 @@ index 9089724..a6b6f80 100644
};
--
2.8.0
2.9.0

382
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

File diff suppressed because it is too large Load Diff