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 6037179f6b48a9becdc9e8328ee3b4cc45a8f8eb.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-02-05 16:45:33 +01:00
parent e369069feb
commit 5d71a4eff3
6 changed files with 346 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

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

42
patches/wined3d-CSMT_Main/0010-wined3d-Remove-surface_invalidate_location.patch
View File

@ -1,4 +1,4 @@
From 2c0a31e8b32070ac3de5ce8a5bcb9d07ff8ee539 Mon Sep 17 00:00:00 2001
From 03998dcf5391b8b5da7b8cecbfe2ac6b82c77502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Sat, 4 Jan 2014 01:02:15 +0100
Subject: wined3d: Remove surface_invalidate_location.
@ -15,10 +15,10 @@ Subject: wined3d: Remove surface_invalidate_location.
8 files changed, 29 insertions(+), 41 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 97de5aa..84c56f6 100644
index 60d2560..eb09795 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -7910,7 +7910,7 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_
@@ -7919,7 +7919,7 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_
context_release(context);
wined3d_resource_validate_location(&dst_surface->resource, dst_surface->container->resource.draw_binding);
@ -26,7 +26,7 @@ index 97de5aa..84c56f6 100644
+ wined3d_resource_invalidate_location(&dst_surface->resource, ~dst_surface->container->resource.draw_binding);
}
static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface,
static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view,
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 490c20f..9408cd9 100644
--- a/dlls/wined3d/context.c
@ -41,7 +41,7 @@ index 490c20f..9408cd9 100644
}
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 8ff6802..0a5b48d 100644
index 3cfff6e..1f061fd 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -399,7 +399,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
@ -53,7 +53,7 @@ index 8ff6802..0a5b48d 100644
}
}
@@ -4132,7 +4132,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str
@@ -4140,7 +4140,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str
context_release(context);
wined3d_resource_validate_location(&surface->resource, WINED3D_LOCATION_TEXTURE_RGB);
@ -76,7 +76,7 @@ index 75489db..9ba6ef7 100644
else
{
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 048aa74..5482650 100644
index c4b9cac..b292adc 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -597,7 +597,7 @@ static void surface_evict_sysmem(struct wined3d_surface *surface)
@ -88,7 +88,7 @@ index 048aa74..5482650 100644
}
static BOOL surface_use_pbo(const struct wined3d_surface *surface)
@@ -1095,7 +1095,7 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win
@@ -1111,7 +1111,7 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win
checkGLcall("glDeleteBuffers(1, &surface->pbo)");
surface->pbo = 0;
@ -97,7 +97,7 @@ index 048aa74..5482650 100644
}
static ULONG surface_resource_incref(struct wined3d_resource *resource)
@@ -1143,21 +1143,21 @@ static void surface_unload(struct wined3d_resource *resource)
@@ -1159,21 +1159,21 @@ static void surface_unload(struct wined3d_resource *resource)
if (resource->usage & WINED3DUSAGE_DEPTHSTENCIL)
{
wined3d_resource_validate_location(&surface->resource, WINED3D_LOCATION_DISCARDED);
@ -122,7 +122,7 @@ index 048aa74..5482650 100644
}
/* Destroy PBOs, but load them into real sysmem before */
@@ -1208,7 +1208,10 @@ static HRESULT surface_resource_sub_resource_unmap(struct wined3d_resource *reso
@@ -1224,7 +1224,10 @@ static HRESULT surface_resource_sub_resource_unmap(struct wined3d_resource *reso
static void wined3d_surface_location_invalidated(struct wined3d_resource *resource, DWORD location)
{
@ -134,7 +134,7 @@ index 048aa74..5482650 100644
}
static const struct wined3d_resource_ops surface_resource_ops =
@@ -1692,7 +1695,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
@@ -1708,7 +1711,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
context_release(context);
wined3d_resource_validate_location(&dst_surface->resource, WINED3D_LOCATION_TEXTURE_RGB);
@ -143,7 +143,7 @@ index 048aa74..5482650 100644
return WINED3D_OK;
}
@@ -2661,7 +2664,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
@@ -2677,7 +2680,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_
}
if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY)))
@ -152,7 +152,7 @@ index 048aa74..5482650 100644
switch (surface->resource.map_binding)
{
@@ -3053,7 +3056,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc
@@ -3069,7 +3072,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc
/* The texture is now most up to date - If the surface is a render target
* and has a drawable, this path is never entered. */
wined3d_resource_validate_location(&dst_surface->resource, WINED3D_LOCATION_TEXTURE_RGB);
@ -161,7 +161,7 @@ index 048aa74..5482650 100644
}
/* Uses the hardware to stretch and flip the image */
@@ -3121,7 +3124,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
@@ -3137,7 +3140,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
checkGLcall("glEnable(texture_target)");
/* For now invalidate the texture copy of the back buffer. Drawable and sysmem copy are untouched */
@ -170,7 +170,7 @@ index 048aa74..5482650 100644
}
/* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag
@@ -3326,7 +3329,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
@@ -3342,7 +3345,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
/* The texture is now most up to date - If the surface is a render target
* and has a drawable, this path is never entered. */
wined3d_resource_validate_location(&dst_surface->resource, WINED3D_LOCATION_TEXTURE_RGB);
@ -179,7 +179,7 @@ index 048aa74..5482650 100644
}
/* Front buffer coordinates are always full screen coordinates, but our GL
@@ -3803,18 +3806,6 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
@@ -3836,18 +3839,6 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
surface->ds_current_size.cy = surface->resource.height;
}
@ -198,7 +198,7 @@ index 048aa74..5482650 100644
static DWORD resource_access_from_location(DWORD location)
{
switch (location)
@@ -4381,7 +4372,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl
@@ -4395,7 +4386,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl
(old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL);
wined3d_resource_validate_location(&dst_surface->resource, dst_surface->container->resource.draw_binding);
@ -207,7 +207,7 @@ index 048aa74..5482650 100644
}
const struct blit_shader ffp_blit = {
@@ -5358,7 +5349,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
@@ -5373,7 +5364,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
context_release(context);
wined3d_resource_validate_location(&dst_surface->resource, dst_surface->container->resource.draw_binding);
@ -216,7 +216,7 @@ index 048aa74..5482650 100644
return WINED3D_OK;
}
@@ -5477,7 +5468,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
@@ -5492,7 +5483,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
{
wined3d_resource_free_sysmem(&surface->resource);
wined3d_resource_validate_location(&surface->resource, WINED3D_LOCATION_DIB);
@ -299,10 +299,10 @@ index 535159a..da1bbbb 100644
context_release(context);
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 05fbac6..0c34527 100644
index dc24c36..428eadd 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2511,7 +2511,6 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) DECLSPEC_HID
@@ -2544,7 +2544,6 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) DECLSPEC_HID
GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN;
void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context,
unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN;

30
patches/wined3d-CSMT_Main/0121-wined3d-Destroy-views-through-the-CS.patch
View File

@ -1,4 +1,4 @@
From 8270da0218acc127fbf5032a9c351beeb1d40c56 Mon Sep 17 00:00:00 2001
From eef628fde30bac893e13569c49213893a46583cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Thu, 21 Aug 2014 22:47:58 +0200
Subject: wined3d: Destroy views through the CS.
@ -14,7 +14,7 @@ Also contains an ugly hack for ffp_blit_depth_fill.
4 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 955459b..6453cda 100644
index b489506..a5df7a7 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -78,6 +78,7 @@ enum wined3d_cs_op
@ -74,29 +74,29 @@ index 955459b..6453cda 100644
static inline void *_wined3d_cs_mt_require_space(struct wined3d_cs *cs, size_t size, BOOL prio)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 8d87410..695790c 100644
index b1db403..9f89468 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4089,7 +4089,7 @@ static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d
@@ -939,7 +939,7 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const
}
device_clear_render_targets(device, 1, &fb, 1, dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0);
hr = blitter->depth_fill(device, view, rect, depth);
- wined3d_rendertarget_view_decref(view);
+ wined3d_rendertarget_view_decref_worker(view);
return WINED3D_OK;
return hr;
}
@@ -4109,7 +4109,7 @@ static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, struct wined3d
@@ -3207,7 +3207,7 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const st
}
device_clear_render_targets(device, 0, &fb, 1, dst_rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0);
- wined3d_rendertarget_view_decref(fb.depth_stencil);
+ wined3d_rendertarget_view_decref_worker(fb.depth_stencil);
hr = blitter->color_fill(device, view, rect, color);
- wined3d_rendertarget_view_decref(view);
+ wined3d_rendertarget_view_decref_worker(view);
return WINED3D_OK;
return hr;
}
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index e621356..998231f 100644
index 8d4f7fd..e4694af 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -33,6 +33,11 @@ ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *v
@ -147,10 +147,10 @@ index e621356..998231f 100644
return refcount;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 0270d6a..b3f920e 100644
index c9578bd..9c70257 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2850,6 +2850,7 @@ void wined3d_cs_emit_buffer_swap_mem(struct wined3d_cs *cs, struct wined3d_buffe
@@ -2902,6 +2902,7 @@ void wined3d_cs_emit_buffer_swap_mem(struct wined3d_cs *cs, struct wined3d_buffe
void wined3d_cs_emit_buffer_invalidate_bo_range(struct wined3d_cs *cs,
struct wined3d_buffer *buffer, UINT offset, UINT size) DECLSPEC_HIDDEN;
void wined3d_cs_emit_buffer_preload(struct wined3d_cs *cs, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN;
@ -158,7 +158,7 @@ index 0270d6a..b3f920e 100644
/* Direct3D terminology with little modifications. We do not have an issued state
* because only the driver knows about it, but we have a created state because d3d
@@ -2975,6 +2976,9 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface(
@@ -3027,6 +3028,9 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface(
return surface_from_resource(resource);
}

138
patches/wined3d-CSMT_Main/0153-wined3d-Don-t-incref-decref-textures-in-color-depth-.patch
View File

@ -1,4 +1,4 @@
From 54eb3e212afc243fef25a46017ae3d822014f336 Mon Sep 17 00:00:00 2001
From 9ceff8564c938a798238a8ff91ab75ad2659eb32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Thu, 28 Aug 2014 16:10:09 +0200
Subject: wined3d: Don't incref / decref textures in color / depth fill blits.
@ -7,33 +7,81 @@ See comment in the code. The solution is not particularly nice. A better
approach may be to handle them in ddraw, where we have a permanent view
for the surface.
---
dlls/wined3d/surface.c | 52 +++++++++++++++++++++++++-----------------
dlls/wined3d/view.c | 20 ----------------
dlls/wined3d/surface.c | 59 +++++++++++++++++++++---------------------
dlls/wined3d/view.c | 20 --------------
dlls/wined3d/wined3d_private.h | 1 -
3 files changed, 31 insertions(+), 42 deletions(-)
3 files changed, 30 insertions(+), 50 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 1ccbe35..82485f3 100644
index bff8df5..aa844fc 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4124,19 +4124,26 @@ static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d
const RECT *dst_rect, const struct wined3d_color *color)
@@ -911,8 +911,8 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const
{
const RECT draw_rect = {0, 0, dst_surface->resource.width, dst_surface->resource.height};
struct wined3d_resource *resource = &surface->container->resource;
struct wined3d_device *device = resource->device;
- struct wined3d_rendertarget_view_desc view_desc;
- struct wined3d_rendertarget_view *view;
- struct wined3d_fb_state fb = {&view, NULL};
- HRESULT hr;
-
- if (FAILED(hr = wined3d_rendertarget_view_create_from_surface(dst_surface,
- NULL, &wined3d_null_parent_ops, &view)))
+ struct wined3d_rendertarget_view view;
+ struct wined3d_texture *texture = surface->container;
const struct blit_shader *blitter;
HRESULT hr;
@@ -923,19 +923,17 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const
return WINED3DERR_INVALIDCALL;
}
- view_desc.format_id = resource->format->id;
- view_desc.u.texture.level_idx = surface->texture_level;
- view_desc.u.texture.layer_idx = surface->texture_layer;
- view_desc.u.texture.layer_count = 1;
- if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc,
- resource, NULL, &wined3d_null_parent_ops, &view)))
- {
- ERR("Failed to create rendertarget view, hr %#x.\n", hr);
- return hr;
- }
+ view.resource = &surface->container->resource;
+ view.parent = NULL;
+ view.parent_ops = &wined3d_null_parent_ops;
+ view.format = surface->resource.format;
+ view.buffer_offset = 0;
+ view.width = surface->resource.width;
+ view.height = surface->resource.height;
+ view.depth = 1;
+ view.sub_resource_idx = surface->texture_layer * texture->level_count + surface->texture_level;
- hr = blitter->depth_fill(device, view, rect, depth);
- wined3d_rendertarget_view_decref_worker(view);
+ hr = blitter->depth_fill(device, &view, rect, depth);
return hr;
}
@@ -3235,8 +3233,8 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const st
{
struct wined3d_resource *resource = &s->container->resource;
struct wined3d_device *device = resource->device;
- struct wined3d_rendertarget_view_desc view_desc;
- struct wined3d_rendertarget_view *view;
+ struct wined3d_rendertarget_view view;
+ struct wined3d_texture *texture = s->container;
const struct blit_shader *blitter;
HRESULT hr;
@@ -3247,19 +3245,22 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const st
return WINED3DERR_INVALIDCALL;
}
- view_desc.format_id = resource->format->id;
- view_desc.u.texture.level_idx = s->texture_level;
- view_desc.u.texture.layer_idx = s->texture_layer;
- view_desc.u.texture.layer_count = 1;
- if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc,
- resource, NULL, &wined3d_null_parent_ops, &view)))
- {
- ERR("Failed to create rendertarget view, hr %#x.\n", hr);
- return hr;
- }
+ struct wined3d_rendertarget_view view, *view_ptr = &view;
+ struct wined3d_fb_state fb = {&view_ptr, NULL, 1};
+ struct wined3d_texture *texture = dst_surface->container;
+
+ /* Can't incref / decref the resource here. This is executed inside the worker
+ * thread. Playing with the refcount here makes the worker thread visible to
+ * the client lib. Problems occur when the worker thread happens to hold the
@ -42,52 +90,30 @@ index 1ccbe35..82485f3 100644
+ view.resource = &texture->resource;
+ view.parent = NULL;
+ view.parent_ops = &wined3d_null_parent_ops;
+ view.format = dst_surface->resource.format;
+ view.format = s->resource.format;
+ view.buffer_offset = 0;
+ view.width = dst_surface->resource.width;
+ view.height = dst_surface->resource.height;
+ view.width = s->resource.width;
+ view.height = s->resource.height;
+ view.depth = 1;
+ view.sub_resource_idx = dst_surface->texture_layer * texture->level_count + dst_surface->texture_level;
+ view.sub_resource_idx = s->texture_layer * texture->level_count + s->texture_level;
device_clear_render_targets(device, 1, &fb, 1, dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0);
- hr = blitter->color_fill(device, view, rect, color);
- wined3d_rendertarget_view_decref_worker(view);
+ hr = blitter->color_fill(device, &view, rect, color);
return WINED3D_OK;
return hr;
}
@@ -4145,18 +4152,21 @@ static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, struct wined3d
const RECT *dst_rect, float depth)
@@ -4056,7 +4057,7 @@ static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d
const RECT *rect, const struct wined3d_color *color)
{
const RECT draw_rect = {0, 0, dst_surface->resource.width, dst_surface->resource.height};
- struct wined3d_fb_state fb = {NULL, NULL};
- HRESULT hr;
-
- if (FAILED(hr = wined3d_rendertarget_view_create_from_surface(dst_surface,
- NULL, &wined3d_null_parent_ops, &fb.depth_stencil)))
- {
- ERR("Failed to create rendertarget view, hr %#x.\n", hr);
- return hr;
- }
+ struct wined3d_rendertarget_view view;
+ struct wined3d_fb_state fb = {NULL, &view};
+ struct wined3d_texture *texture = dst_surface->container;
+
+ view.resource = &dst_surface->container->resource;
+ view.parent = NULL;
+ view.parent_ops = &wined3d_null_parent_ops;
+ view.format = dst_surface->resource.format;
+ view.buffer_offset = 0;
+ view.width = dst_surface->resource.width;
+ view.height = dst_surface->resource.height;
+ view.depth = 1;
+ view.sub_resource_idx = dst_surface->texture_layer * texture->level_count + dst_surface->texture_level;
const RECT draw_rect = {0, 0, view->width, view->height};
- struct wined3d_fb_state fb = {&view, NULL};
+ struct wined3d_fb_state fb = {&view, NULL, 1};
device_clear_render_targets(device, 0, &fb, 1, dst_rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0);
- wined3d_rendertarget_view_decref_worker(fb.depth_stencil);
device_clear_render_targets(device, 1, &fb, 1, rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0);
return WINED3D_OK;
}
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 56eb7b3..870f1df 100644
index e4694af..f2134f4 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -58,26 +58,6 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v
@ -118,10 +144,10 @@ index 56eb7b3..870f1df 100644
{
TRACE("view %p.\n", view);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 3abd0a8..88329e5 100644
index 929e7c7..0e0c8fa 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2859,7 +2859,6 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface(
@@ -3063,7 +3063,6 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface(
return surface_from_resource(resource);
}
@ -130,5 +156,5 @@ index 3abd0a8..88329e5 100644
struct wined3d_shader_resource_view
--
2.1.3
2.7.0

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

File diff suppressed because it is too large Load Diff

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

@ -1,4 +1,4 @@
From 450ad7808200772e20a81e538628a86b304a5fd8 Mon Sep 17 00:00:00 2001
From 8a4931be2728787f751461a2482c33ff722808ee 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
@ -169,7 +169,7 @@ index 52502bf..a81b6c7 100644
return hr;
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 71b424d..8fa19e2 100644
index 923a935..409fa32 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -984,7 +984,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface,
@ -247,7 +247,7 @@ index 73250ec..c1079ba 100644
TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 6f930ef..33ce73d 100644
index aa468d1..9d451a1 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -182,10 +182,10 @@
@ -262,9 +262,9 @@ index 6f930ef..33ce73d 100644
+@ cdecl wined3d_resource_sub_resource_unmap(ptr long)
@ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr)
@ cdecl wined3d_rendertarget_view_create_from_surface(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 f29f4ff..e56ee35 100644
index 507d63f..50d3213 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2421,11 +2421,11 @@ void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource,