wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 225c43b8124aaeb4c2e307379ab98036db1a38b3.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-09-01 19:55:33 +02:00
parent 938ffad317
commit d28e0d12bb
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/d3d11-ID3D11Texture1D/0004-d3d11-Generate-dxgi-surface-in-d3d_texture1d_init.patch
View File

@ -1,4 +1,4 @@
From ce85a9cdc238c5cbeda3d5f1c4d3841fac3be74e Mon Sep 17 00:00:00 2001
From d29fadf3f80f98f06f955739ede3739dc1425459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 27 Aug 2016 23:59:20 +0200
Subject: d3d11: Generate dxgi surface in d3d_texture1d_init.
@ -9,7 +9,7 @@ Subject: d3d11: Generate dxgi surface in d3d_texture1d_init.
2 files changed, 34 insertions(+)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index 4a18ca7..a9a5df1 100644
index 3bd2dec..edf7217 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -112,6 +112,7 @@ struct d3d_texture1d
@ -21,7 +21,7 @@ index 4a18ca7..a9a5df1 100644
D3D11_TEXTURE1D_DESC desc;
ID3D11Device *device;
diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c
index 0c269c1..e116994 100644
index 2fe7aa4..94f4c57 100644
--- a/dlls/d3d11/texture.c
+++ b/dlls/d3d11/texture.c
@@ -57,6 +57,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture1d_QueryInterface(ID3D11Texture1D
@ -63,8 +63,8 @@ index 0c269c1..e116994 100644
+ return E_FAIL;
+ }
+
+ hr = IWineDXGIDevice_create_surface(wine_device, wined3d_texture_get_resource(texture->wined3d_texture),
+ 0, NULL, (IUnknown *)&texture->ID3D10Texture1D_iface, (void **)&texture->dxgi_surface);
+ hr = IWineDXGIDevice_create_surface(wine_device, texture->wined3d_texture, 0, NULL,
+ (IUnknown *)&texture->ID3D10Texture1D_iface, (void **)&texture->dxgi_surface);
+ IWineDXGIDevice_Release(wine_device);
+ if (FAILED(hr))
+ {
@ -79,5 +79,5 @@ index 0c269c1..e116994 100644
texture->device = &device->ID3D11Device_iface;
--
2.8.1
2.9.0

10
patches/ddraw-Device_Caps/0003-ddraw-Set-ddsOldCaps-correctly-in-ddraw7_GetCaps.patch
View File

@ -1,4 +1,4 @@
From 806018e4f6faf91ea74fd3bf287643e9e825b36b Mon Sep 17 00:00:00 2001
From 85594497f9133133454a8008a93c7695a3e6ea83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 4 Mar 2016 22:22:42 +0100
Subject: ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
@ -25,10 +25,10 @@ index e50edb4..bac9b8a 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index bfc6bfe..76e2236 100644
index e8194b3..26556e9 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -9071,6 +9071,31 @@ static void test_getdc(void)
@@ -9503,6 +9503,31 @@ static void test_transform_vertices(void)
DestroyWindow(window);
}
@ -60,10 +60,10 @@ index bfc6bfe..76e2236 100644
START_TEST(ddraw1)
{
IDirectDraw *ddraw;
@@ -9153,4 +9178,5 @@ START_TEST(ddraw1)
test_overlay_rect();
@@ -9586,4 +9611,5 @@ START_TEST(ddraw1)
test_blt();
test_getdc();
test_transform_vertices();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "23a64ca074021bfda46f6287aaa529d6e8f66774"
echo "225c43b8124aaeb4c2e307379ab98036db1a38b3"
}
# Show version information