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 ea85a1ca598228eeacc370b0d827ca9e11387dfe.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-02-08 20:35:24 +01:00
parent d35ab071b5
commit 0e424c26ad
5 changed files with 146 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches/Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch
View File

@ -1,4 +1,4 @@
From 863dce444080b590bef8a9f31e38fc69aa18b29a Mon Sep 17 00:00:00 2001
From cb7b1ca0fccd0078815b117deed0380b68e6daaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 20 Jul 2014 22:22:14 +0200
Subject: wined3d: allow changing strict drawing through an exported function
@ -9,7 +9,7 @@ Subject: wined3d: allow changing strict drawing through an exported function
2 files changed, 7 insertions(+)
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 082a693..91fcf0f 100644
index 4ec8336..a58f4e4 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -222,6 +222,8 @@
@ -20,7 +20,7 @@ index 082a693..91fcf0f 100644
+
@ cdecl wined3d_surface_get_parent(ptr)
@ cdecl wined3d_surface_get_pitch(ptr)
@ cdecl wined3d_surface_set_overlay_position(ptr long long)
@ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr)
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 0543d97..78cc3a2 100644
--- a/dlls/wined3d/wined3d_main.c

14
patches/ddraw-Revert_Surface_Init/0001-Revert-ddraw-Use-wined3d_texture_get_sub_resource-in.patch
View File

@ -1,4 +1,4 @@
From d87fa0b16491e8ec3b38fbe9b43c6f91adceee02 Mon Sep 17 00:00:00 2001
From 6d4b1e67c342ec2e570f0c90774edb7c55e3649a Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 7 Feb 2016 18:52:16 +0100
Subject: Revert "ddraw: Use wined3d_texture_get_sub_resource() in
@ -13,7 +13,7 @@ This reverts commit b1709522307a160a7c151f5293095a3c26ab998f.
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index d6358f8..f9862df 100644
index e918f25..4888d1d 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1268,7 +1268,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7
@ -44,7 +44,7 @@ index d6358f8..f9862df 100644
wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture);
src_impl->wined3d_texture = texture;
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 57925a6..90c8847 100644
index e36e353..bdf40ce 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1890,6 +1890,13 @@ void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface)
@ -62,7 +62,7 @@ index 57925a6..90c8847 100644
{
unsigned int alignment;
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 082a693..5eb4e89 100644
index 4ec8336..f60db7c 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -224,6 +224,7 @@
@ -70,11 +70,11 @@ index 082a693..5eb4e89 100644
@ cdecl wined3d_surface_get_parent(ptr)
@ cdecl wined3d_surface_get_pitch(ptr)
+@ cdecl wined3d_surface_get_resource(ptr)
@ cdecl wined3d_surface_set_overlay_position(ptr long long)
@ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr)
@ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 36e34ea..d740737 100644
index b43b31d..9f41718 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2476,6 +2476,7 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock);
@ -82,9 +82,9 @@ index 36e34ea..d740737 100644
void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface);
DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface);
+struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface);
HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y);
HRESULT __cdecl wined3d_surface_update_overlay(struct wined3d_surface *surface, const RECT *src_rect,
struct wined3d_surface *dst_surface, const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx);
HRESULT __cdecl wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface,
--
2.7.0

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "6e30b042e17b4a62f48ca29f26cf9e62c7fd077a"
echo "ea85a1ca598228eeacc370b0d827ca9e11387dfe"
}
# Show version information

62
patches/wined3d-CSMT_Main/0001-wined3d-Merge-get_pitch-functions.patch
View File

@ -1,4 +1,4 @@
From 429d2f5f7f32f0703b910f27a534cb06d9b6f722 Mon Sep 17 00:00:00 2001
From 9ac5eaa0e224fa33ef7afc9520d54262de9e506d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Thu, 19 Sep 2013 14:22:24 +0200
Subject: wined3d: Merge get_pitch functions.
@ -12,10 +12,10 @@ Subject: wined3d: Merge get_pitch functions.
5 files changed, 70 insertions(+), 71 deletions(-)
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 74be48d..7922433 100644
index 44cdb43..ed598cc 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -430,3 +430,34 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource)
@@ -440,3 +440,34 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource)
else
resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB;
}
@ -51,10 +51,10 @@ index 74be48d..7922433 100644
+ TRACE("Returning row pitch %u, slice pitch %u.\n", *row_pitch, *slice_pitch);
+}
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 39a2c3b..2e7f0f8 100644
index b14d0a3..df9b855 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -364,6 +364,7 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface)
@@ -364,6 +364,7 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface)
BITMAPINFO *b_info;
int extraline = 0;
DWORD *masks;
@ -62,7 +62,7 @@ index 39a2c3b..2e7f0f8 100644
TRACE("surface %p.\n", surface);
@@ -409,10 +410,11 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface)
@@ -409,10 +410,11 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface)
b_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
/* TODO: Is there a nicer way to force a specific alignment? (8 byte for ddraw) */
@ -76,7 +76,7 @@ index 39a2c3b..2e7f0f8 100644
b_info->bmiHeader.biPlanes = 1;
b_info->bmiHeader.biBitCount = format->byte_count * 8;
@@ -1330,14 +1332,14 @@ static void surface_download_data(struct wined3d_surface *surface, const struct
@@ -1332,14 +1334,14 @@ static void surface_download_data(struct wined3d_surface *surface, const struct
void *mem;
GLenum gl_format = format->glFormat;
GLenum gl_type = format->glType;
@ -94,7 +94,7 @@ index 39a2c3b..2e7f0f8 100644
src_pitch = (src_pitch + alignment - 1) & ~(alignment - 1);
mem = HeapAlloc(GetProcessHeap(), 0, src_pitch * surface->pow2Height);
}
@@ -1424,12 +1426,12 @@ static void surface_download_data(struct wined3d_surface *surface, const struct
@@ -1426,12 +1428,12 @@ static void surface_download_data(struct wined3d_surface *surface, const struct
* won't be released, and doesn't have to be re-read. */
src_data = mem;
dst_data = data.addr;
@ -110,7 +110,7 @@ index 39a2c3b..2e7f0f8 100644
}
HeapFree(GetProcessHeap(), 0, mem);
@@ -1591,7 +1593,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
@@ -1599,7 +1601,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
UINT update_w, update_h;
UINT dst_w, dst_h;
RECT r, dst_rect;
@ -119,7 +119,7 @@ index 39a2c3b..2e7f0f8 100644
POINT p;
TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n",
@@ -1679,10 +1681,10 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
@@ -1687,10 +1689,10 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
wined3d_texture_bind_and_dirtify(dst_surface->container, context, FALSE);
surface_get_memory(src_surface, &data, src_surface->locations);
@ -132,7 +132,7 @@ index 39a2c3b..2e7f0f8 100644
context_release(context);
@@ -1934,21 +1936,10 @@ HRESULT CDECL wined3d_surface_restore(struct wined3d_surface *surface)
@@ -1892,21 +1894,10 @@ void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface)
DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface)
{
@ -157,8 +157,8 @@ index 39a2c3b..2e7f0f8 100644
+ return row_pitch;
}
HRESULT CDECL wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y)
@@ -2110,20 +2101,21 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
HRESULT CDECL wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface,
@@ -2020,20 +2011,21 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
surface->resource.map_binding = WINED3D_LOCATION_USER_MEMORY;
valid_location = WINED3D_LOCATION_USER_MEMORY;
}
@ -184,7 +184,7 @@ index 39a2c3b..2e7f0f8 100644
}
/* The format might be changed to a format that needs conversion.
@@ -2749,7 +2741,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
@@ -2655,7 +2647,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_
if (fmt_flags & WINED3DFMT_FLAG_BROKEN_PITCH)
map_desc->row_pitch = surface->resource.width * format->byte_count;
else
@ -193,7 +193,7 @@ index 39a2c3b..2e7f0f8 100644
map_desc->slice_pitch = surface->resource.height * map_desc->row_pitch;
if (!box)
@@ -2898,6 +2890,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
@@ -2706,6 +2698,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
int i;
BOOL srcIsUpsideDown;
struct wined3d_bo_address data;
@ -201,7 +201,7 @@ index 39a2c3b..2e7f0f8 100644
surface_get_memory(surface, &data, dst_location);
@@ -2939,8 +2932,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
@@ -2747,8 +2740,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
}
/* Setup pixel store pack state -- to glReadPixels into the correct place */
@ -212,7 +212,7 @@ index 39a2c3b..2e7f0f8 100644
checkGLcall("glPixelStorei");
gl_info->gl_ops.gl.p_glReadPixels(0, 0,
@@ -2957,8 +2950,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
@@ -2765,8 +2758,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
{
/* glReadPixels returns the image upside down, and there is no way to prevent this.
* Flip the lines in software. */
@ -221,7 +221,7 @@ index 39a2c3b..2e7f0f8 100644
if (!(row = HeapAlloc(GetProcessHeap(), 0, pitch)))
goto error;
@@ -4077,7 +4068,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
@@ -3920,7 +3911,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
struct wined3d_device *device = surface->resource.device;
const struct wined3d_color_key_conversion *conversion;
struct wined3d_texture *texture = surface->container;
@ -230,7 +230,7 @@ index 39a2c3b..2e7f0f8 100644
struct wined3d_bo_address data;
struct wined3d_format format;
POINT dst_point = {0, 0};
@@ -4162,7 +4153,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
@@ -4005,7 +3996,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
wined3d_texture_bind_and_dirtify(texture, context, srgb);
width = surface->resource.width;
@ -239,7 +239,7 @@ index 39a2c3b..2e7f0f8 100644
format = *texture->resource.format;
if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE)))
@@ -4200,9 +4191,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
@@ -4043,9 +4034,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
context_release(context);
return E_OUTOFMEMORY;
}
@ -251,7 +251,7 @@ index 39a2c3b..2e7f0f8 100644
data.addr = mem;
}
else if (conversion)
@@ -4222,14 +4213,14 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
@@ -4065,14 +4056,14 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
}
if (texture->swapchain && texture->swapchain->palette)
palette = texture->swapchain->palette;
@ -270,10 +270,10 @@ index 39a2c3b..2e7f0f8 100644
HeapFree(GetProcessHeap(), 0, mem);
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 4380e5f..6511d2e 100644
index 297ab27..6daf572 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1269,7 +1269,7 @@ static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_reso
@@ -1142,7 +1142,7 @@ static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_reso
struct wined3d_const_bo_address addr;
unsigned int row_pitch, slice_pitch;
@ -283,7 +283,7 @@ index 4380e5f..6511d2e 100644
FIXME("Ignoring row/slice pitch (%u/%u).\n", data->row_pitch, data->slice_pitch);
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 0231c23..7be9ff5 100644
index 3ac7f98..9235f3f 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -40,30 +40,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume)
@ -326,7 +326,7 @@ index 0231c23..7be9ff5 100644
converted_mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth);
format->convert(data->addr, converted_mem, src_row_pitch, src_slice_pitch,
@@ -610,7 +586,7 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume,
@@ -607,7 +583,7 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume,
}
else
{
@ -336,10 +336,10 @@ index 0231c23..7be9ff5 100644
if (!box)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 4c4a58a..17ccabd 100644
index 1f29257..865f476 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2184,6 +2184,7 @@ struct wined3d_resource
@@ -2275,6 +2275,7 @@ struct wined3d_resource
UINT size;
DWORD priority;
void *heap_memory;
@ -347,7 +347,7 @@ index 4c4a58a..17ccabd 100644
struct list resource_list_entry;
void *parent;
@@ -2211,6 +2212,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
@@ -2302,6 +2303,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
@ -356,7 +356,7 @@ index 4c4a58a..17ccabd 100644
GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;
GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;
BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
@@ -2348,7 +2351,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) DECLSPEC_HIDDEN
@@ -2437,7 +2440,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) DECLSPEC_HIDDEN
HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc,
unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN;
void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN;
@ -364,7 +364,7 @@ index 4c4a58a..17ccabd 100644
void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context,
BOOL srgb_mode) DECLSPEC_HIDDEN;
void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN;
@@ -2401,7 +2403,6 @@ struct wined3d_surface
@@ -2490,7 +2492,6 @@ struct wined3d_surface
DWORD flags;
@ -373,5 +373,5 @@ index 4c4a58a..17ccabd 100644
UINT pow2Height;
--
2.6.2
2.7.0

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

File diff suppressed because it is too large Load Diff