wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 10db51d5c26f0a71956989ecff83da90f4d94fda.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-05-05 02:26:52 +02:00
parent a08b6b2b62
commit 31212d2845
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch
View File

@ -1,4 +1,4 @@
From bfc12300336107144795aef41eea22040ed550fe Mon Sep 17 00:00:00 2001
From d29f7e7f2e435ffee61f69eb488884b6d7043d0e Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Fri, 19 Dec 2014 22:31:46 +0100
Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
@ -9,10 +9,10 @@ Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
2 files changed, 91 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 1a14edb4a58..ea7cb34da57 100644
index 864c3902fde..2de2058666a 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3859,13 +3859,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
@@ -3891,13 +3891,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
return D3D_OK;
}
@ -58,10 +58,10 @@ index 1a14edb4a58..ea7cb34da57 100644
static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func,
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index 3e9d2551915..7d1c0a86e38 100644
index f3bc9e3c36a..6fb770eafcb 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -6183,6 +6183,65 @@ static void test_effect_large_address_aware_flag(IDirect3DDevice9 *device)
@@ -6290,6 +6290,65 @@ static void test_effect_get_pass_desc(IDirect3DDevice9 *device)
effect->lpVtbl->Release(effect);
}
@ -127,10 +127,10 @@ index 3e9d2551915..7d1c0a86e38 100644
START_TEST(effect)
{
HWND wnd;
@@ -6233,6 +6292,7 @@ START_TEST(effect)
test_cross_effect_handle(device);
@@ -6341,6 +6400,7 @@ START_TEST(effect)
test_effect_shared_parameters(device);
test_effect_large_address_aware_flag(device);
test_effect_get_pass_desc(device);
+ test_effect_technique_validation(device);
count = IDirect3DDevice9_Release(device);

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "8753a1b271795d2f977b41a814de7e4ace780d2e"
echo "10db51d5c26f0a71956989ecff83da90f4d94fda"
}
# Show version information