From 7ad83e6e1402a01aec20f990ccf693732eb79e30 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 2 Sep 2017 03:46:01 +0200 Subject: [PATCH] Rebase against 0b1d7ff7655c5aa7ff073f67400bd4401727183f. --- ...ent-ID3DXEffect_FindNextValidTechniqu.patch | 18 +++++++++--------- patches/patchinstall.sh | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch b/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch index 1971e980..9acdd9b3 100644 --- a/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch +++ b/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch @@ -1,4 +1,4 @@ -From 16bc1dc30e86d07223f4ae5cff1b2dc0626ee793 Mon Sep 17 00:00:00 2001 +From 4615fc9e392d8942286b4cb40482a6ede5ad6d59 Mon Sep 17 00:00:00 2001 From: Christian Costa 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 333feaba204..9929a9a6b23 100644 +index 2cd0c22f646..6c30eb78640 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c -@@ -3934,13 +3934,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX +@@ -3948,13 +3948,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX return D3D_OK; } @@ -58,11 +58,11 @@ index 333feaba204..9929a9a6b23 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 b966b42a9b5..cbac3e2475b 100644 +index bb26fe4e515..a7ce30dd65e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c -@@ -6984,6 +6984,65 @@ static void test_effect_skip_constants(IDirect3DDevice9 *device) - effect->lpVtbl->Release(effect); +@@ -7162,6 +7162,65 @@ static void test_effect_unsupported_shader(void) + DestroyWindow(window); } +/* @@ -127,14 +127,14 @@ index b966b42a9b5..cbac3e2475b 100644 START_TEST(effect) { HWND wnd; -@@ -7036,6 +7095,7 @@ START_TEST(effect) - test_effect_large_address_aware_flag(device); +@@ -7215,6 +7274,7 @@ START_TEST(effect) test_effect_get_pass_desc(device); test_effect_skip_constants(device); + test_effect_unsupported_shader(); + test_effect_technique_validation(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count); -- -2.13.1 +2.14.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 9d8f4bd7..e179a06e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "e06b7693d6f0980b1db2fa3b9920c7a925ceb8be" + echo "0b1d7ff7655c5aa7ff073f67400bd4401727183f" } # Show version information