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 9a80284e1a886ff7e01d33f68715c9bfdb773459.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-05-19 20:06:07 +02:00
parent 9aefba7af5
commit f10c1d3c42
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From d37e6ad06898282c5cf0e9665afad8ce5b1d8016 Mon Sep 17 00:00:00 2001
From 588edfad4fcfed3a22a0156e66d2409a437e3f96 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 c4cf1ad..423ef22 100644
index aefd308..e89445a 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -430,7 +430,8 @@ static UINT wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data)
@@ -431,7 +431,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,7 +26,7 @@ index c4cf1ad..423ef22 100644
return sizeof(*op);
}
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 178e634..6ee5501 100644
index f25edc7..7a85b65 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
@@ -72,7 +72,7 @@ index 178e634..6ee5501 100644
struct wined3d_surface *front, *back;
HBITMAP bitmap;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8c31ffd..54bb128 100644
index f0e9863..6388c16 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3079,7 +3079,8 @@ struct wined3d_shader_resource_view
@@ -82,7 +82,7 @@ index 8c31ffd..54bb128 100644
- const RECT *src_rect, const RECT *dst_rect, DWORD flags);
+ const RECT *src_rect, const RECT *dst_rect, DWORD flags,
+ struct wined3d_rendertarget_view *depth_stencil);
void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swaphchain);
void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swapchain);
};
--

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

@@ -70,7 +70,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader
shader_arb_ps_local_constants(compiled, context, state, rt_height);
}
@@ -7950,11 +7958,16 @@
@@ -7997,11 +8005,16 @@
/* Leave the opengl state valid for blitting */
arbfp_blit_unset(context->gl_info);
@@ -6482,7 +6482,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -4276,7 +4276,11 @@
@@ -4282,7 +4282,11 @@
float y_offset = context->render_offscreen
? (center_offset - (2.0f * y) - h) / h
: (center_offset - (2.0f * y) - h) / -h;
@@ -6494,7 +6494,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE;
float z_scale = zenable ? 2.0f : 0.0f;
float z_offset = zenable ? -1.0f : 0.0f;
@@ -5074,7 +5078,11 @@
@@ -5080,7 +5084,11 @@
break;
}
}
@@ -7230,7 +7230,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
+ void (*swapchain_present)(struct wined3d_swapchain *swapchain,
+ const RECT *src_rect, const RECT *dst_rect, DWORD flags);
+#endif /* STAGING_CSMT */
void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swaphchain);
void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swapchain);
};
@@ -3262,8 +3412,10 @@