From f10c1d3c420d358cc9635d29d7ad28861aab9b7e Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 19 May 2016 20:06:07 +0200 Subject: [PATCH] Rebase against 9a80284e1a886ff7e01d33f68715c9bfdb773459. --- ...w-changing-the-opengl-pixel-format-o.patch | 12 +++++------ ...e-a-better-name-for-IDirectSoundBuff.patch | 20 +++++++++---------- patches/patchinstall.sh | 2 +- ...e-depth-stencil-to-swapchain-present.patch | 12 +++++------ .../wined3d-CSMT_Main/9999-IfDefined.patch | 8 ++++---- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/patches/d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch b/patches/d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch index 562f874e..4b64ef1a 100644 --- a/patches/d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch +++ b/patches/d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch @@ -1,4 +1,4 @@ -From 3b07128afb354df0304f1164ed28084b4619b933 Mon Sep 17 00:00:00 2001 +From 26a7497a9fb1184080a1622f6a834bed50d2a239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Wed, 3 Jun 2015 22:57:21 +0200 Subject: winex11.drv: Allow changing the opengl pixel format on the desktop @@ -43,7 +43,7 @@ index f5b1454..ac21f68 100644 swapchain = (IDXGISwapChain *)0xdeadbeef; device = (ID3D10Device1 *)0xdeadbeef; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c -index 03b6113..e1c2e37 100644 +index 04a369c..ee506f5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -805,10 +805,22 @@ static void test_create_device(void) @@ -74,10 +74,10 @@ index 03b6113..e1c2e37 100644 swapchain = (IDXGISwapChain *)0xdeadbeef; device = (ID3D11Device *)0xdeadbeef; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c -index 8860bce..f1d6488 100644 +index 4302f76..342f8d2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c -@@ -11122,6 +11122,21 @@ done: +@@ -11171,6 +11171,21 @@ static void test_get_render_target_data(void) DestroyWindow(window); } @@ -99,10 +99,10 @@ index 8860bce..f1d6488 100644 START_TEST(device) { WNDCLASSA wc = {0}; -@@ -11237,6 +11252,7 @@ START_TEST(device) - test_swapchain_parameters(); +@@ -11287,6 +11302,7 @@ START_TEST(device) test_check_device_format(); test_miptree_layout(); + test_get_render_target_data(); + test_desktop_window(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); diff --git a/patches/dsound-Revert_Cleanup/0001-Revert-dsound-Use-a-better-name-for-IDirectSoundBuff.patch b/patches/dsound-Revert_Cleanup/0001-Revert-dsound-Use-a-better-name-for-IDirectSoundBuff.patch index 4f946003..70f95a91 100644 --- a/patches/dsound-Revert_Cleanup/0001-Revert-dsound-Use-a-better-name-for-IDirectSoundBuff.patch +++ b/patches/dsound-Revert_Cleanup/0001-Revert-dsound-Use-a-better-name-for-IDirectSoundBuff.patch @@ -1,4 +1,4 @@ -From 462599cf79d964c6add1a7250f654d2e3110c4d2 Mon Sep 17 00:00:00 2001 +From 49a87ca03766da11e80ec5f0677d1cd7d46b17ca Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 23 Dec 2015 00:58:57 +0100 Subject: Revert "dsound: Use a better name for @@ -12,7 +12,7 @@ This reverts commit bb72548f3870b1df03ad9fe7ad2e543a69d5d574. 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c -index 2a80c3f..d7717fd 100644 +index e85a5d1..c59090a 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -983,15 +983,19 @@ static const IDirectSoundBuffer8Vtbl dsbvt = @@ -60,10 +60,10 @@ index 2a80c3f..d7717fd 100644 return err; } diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c -index ccefd1f..e50ef58 100644 +index fb9fd66..64bfbd3 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c -@@ -469,6 +469,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( +@@ -461,6 +461,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( WARN("primarybuffer_create() failed\n"); } } else { @@ -72,7 +72,7 @@ index ccefd1f..e50ef58 100644 if (dsbd->lpwfxFormat == NULL) { WARN("invalid parameter: dsbd->lpwfxFormat can't be NULL for " "secondary buffer\n"); -@@ -545,8 +547,9 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( +@@ -537,8 +539,9 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } @@ -85,12 +85,12 @@ index ccefd1f..e50ef58 100644 device->drvcaps.dwFreeHwMixingAllBuffers--; } else diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h -index 07bda48..9c001ed 100644 +index 63d1226..303ce0e 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h -@@ -182,8 +182,10 @@ void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel - void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; - void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +@@ -181,8 +181,10 @@ void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c + void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; + void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, - IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN; @@ -102,5 +102,5 @@ index 07bda48..9c001ed 100644 DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, -- -2.6.4 +2.8.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 3d8b1943..78eddf37 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "58e95f72218fa018739c484f172bc236e685d5bb" + echo "9a80284e1a886ff7e01d33f68715c9bfdb773459" } # Show version information diff --git a/patches/wined3d-CSMT_Main/0020-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch b/patches/wined3d-CSMT_Main/0020-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch index dacee353..0caffa3b 100644 --- a/patches/wined3d-CSMT_Main/0020-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch +++ b/patches/wined3d-CSMT_Main/0020-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch @@ -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?= 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); }; -- diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index b918798e..aa954353 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -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 @@