wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against f6c10b8a75943dc3a49890c9c7a64c91752a4ee0.

Browse Source 
[ntoskrnl-Stubs]
Removed patch to add stub for KeDelayExecutionThread (fixed upstream).
Removed patch to add stub for PsRemoveLoadImageNotifyRoutine (fixed upstream).

[wined3d-Geforce_425M]
Removed patch to add wined3d detection for GeForce GT 425M (accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-04-04 18:52:47 +02:00
parent 6914bab984
commit fb87fbb11d
14 changed files with 27 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
patches/wined3d-resource_map/0001-wined3d-Rename-wined3d_resource_-un-map-to-wined3d_r.patch
View File

@@ -1,4 +1,4 @@
From 0c9c1b424f62d37107a26397a0c8a29cf985abac Mon Sep 17 00:00:00 2001
From b1ebd3a49593c0feb4780fd9cf47910095c3c8fc Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 4 Nov 2015 19:31:30 +0100
Subject: wined3d: Rename wined3d_resource_(un)map to
@@ -21,7 +21,7 @@ To avoid name conflicts in the CSMT patchset.
12 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 8a53e89..935b1ee 100644
index 4e84dad..551dea7 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -273,7 +273,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext
@@ -227,10 +227,10 @@ index 83457fc..7f51a1d 100644
if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index ef8095f..9539e9c 100644
index 62e5129..0a32e14 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3570,7 +3570,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device,
@@ -3569,7 +3569,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device,
for (i = 0; i < level_count; ++i)
{
@@ -239,7 +239,7 @@ index ef8095f..9539e9c 100644
src_level + i, &src, NULL, WINED3D_MAP_READONLY)))
goto done;
@@ -3579,7 +3579,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device,
@@ -3578,7 +3578,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device,
wined3d_volume_upload_data(dst_texture->sub_resources[i].u.volume, context, &data);
wined3d_texture_invalidate_location(dst_texture, i, ~WINED3D_LOCATION_TEXTURE_RGB);
@@ -248,7 +248,7 @@ index ef8095f..9539e9c 100644
goto done;
}
@@ -4291,7 +4291,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined
@@ -4289,7 +4289,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined
struct wined3d_texture *texture;
HRESULT hr;
@@ -257,7 +257,7 @@ index ef8095f..9539e9c 100644
{
ERR("Failed to map source texture.\n");
return NULL;
@@ -4314,7 +4314,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined
@@ -4312,7 +4312,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined
hr = wined3d_texture_create(device, &desc, 1, WINED3D_TEXTURE_CREATE_MAPPABLE,
&data, NULL, &wined3d_null_parent_ops, &texture);
@@ -266,7 +266,7 @@ index ef8095f..9539e9c 100644
if (FAILED(hr))
{
ERR("Failed to create cursor texture.\n");
@@ -4395,7 +4395,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
@@ -4392,14 +4392,14 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
return E_OUTOFMEMORY;
memset(mask_bits, 0xff, mask_size);
@@ -275,10 +275,9 @@ index ef8095f..9539e9c 100644
WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY);
cursor_info.fIcon = FALSE;
cursor_info.xHotspot = x_hotspot;
@@ -4404,7 +4404,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
cursor_image->resource.height, 1, 1, mask_bits);
cursor_info.hbmColor = CreateBitmap(cursor_image->resource.width,
cursor_image->resource.height, 1, 32, map_desc.data);
cursor_info.yHotspot = y_hotspot;
cursor_info.hbmMask = CreateBitmap(cursor_width, cursor_height, 1, 1, mask_bits);
cursor_info.hbmColor = CreateBitmap(cursor_width, cursor_height, 1, 32, map_desc.data);
- wined3d_resource_unmap(&texture->resource, sub_resource_idx);
+ wined3d_resource_sub_resource_unmap(&texture->resource, sub_resource_idx);
@@ -307,10 +306,10 @@ index 423d162..0821fde 100644
TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx);
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 6d0e147..8b13a2f 100644
index a7dfbf5..d47f3a9 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1760,25 +1760,25 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr
@@ -1735,25 +1735,25 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr
memset(&src_map, 0, sizeof(src_map));
memset(&dst_map, 0, sizeof(dst_map));
@@ -341,7 +340,7 @@ index 6d0e147..8b13a2f 100644
return dst_texture;
}
@@ -3669,7 +3669,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
@@ -3648,7 +3648,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
if (src_texture == dst_texture && src_sub_resource_idx == dst_sub_resource_idx)
{
same_sub_resource = TRUE;
@@ -350,7 +349,7 @@ index 6d0e147..8b13a2f 100644
src_map = dst_map;
src_format = dst_texture->resource.format;
dst_format = src_format;
@@ -3694,7 +3694,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
@@ -3673,7 +3673,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
src_texture = converted_texture;
src_sub_resource_idx = 0;
}
@@ -359,7 +358,7 @@ index 6d0e147..8b13a2f 100644
src_format = src_texture->resource.format;
src_fmt_flags = src_texture->resource.format_flags;
}
@@ -3704,7 +3704,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
@@ -3683,7 +3683,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
src_fmt_flags = dst_fmt_flags;
}
@@ -368,7 +367,7 @@ index 6d0e147..8b13a2f 100644
}
bpp = dst_format->byte_count;
@@ -4120,9 +4120,9 @@ error:
@@ -4099,9 +4099,9 @@ error:
FIXME(" Unsupported flags %#x.\n", flags);
release:
@@ -381,7 +380,7 @@ index 6d0e147..8b13a2f 100644
wined3d_texture_decref(converted_texture);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 21cb0db..cfdc1c6 100644
index 9b6bed9..059d794 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -181,10 +181,10 @@
@@ -398,7 +397,7 @@ index 21cb0db..cfdc1c6 100644
@ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr)
@ cdecl wined3d_rendertarget_view_create_from_sub_resource(ptr long ptr ptr ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 9bdd16d..88cddc2 100644
index 05eac77..2c09528 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2360,11 +2360,11 @@ void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource,