wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 8753a1b271795d2f977b41a814de7e4ace780d2e.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-05-04 02:13:14 +02:00
parent eb4a245bbb
commit d7c0a975ea
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 56e710b3d2b2631ee63eb1ed076a2a8af99352ad Mon Sep 17 00:00:00 2001
From bfc12300336107144795aef41eea22040ed550fe 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 8dc4738360..47e79a689a 100644
index 1a14edb4a58..ea7cb34da57 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3667,13 +3667,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
@@ -3859,13 +3859,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
return D3D_OK;
}
@ -58,11 +58,11 @@ index 8dc4738360..47e79a689a 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 b1f7f3ef26..95d29d0155 100644
index 3e9d2551915..7d1c0a86e38 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -6111,6 +6111,65 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device)
ok(!refcount, "Effect pool was not properly freed, refcount %u.\n", refcount);
@@ -6183,6 +6183,65 @@ static void test_effect_large_address_aware_flag(IDirect3DDevice9 *device)
effect->lpVtbl->Release(effect);
}
+/*
@ -127,10 +127,10 @@ index b1f7f3ef26..95d29d0155 100644
START_TEST(effect)
{
HWND wnd;
@@ -6160,6 +6219,7 @@ START_TEST(effect)
test_effect_state_manager(device);
@@ -6233,6 +6292,7 @@ START_TEST(effect)
test_cross_effect_handle(device);
test_effect_shared_parameters(device);
test_effect_large_address_aware_flag(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 "b1203af6ba44ff8858ee9ca50fc05f4f3f633892"
echo "8753a1b271795d2f977b41a814de7e4ace780d2e"
}
# Show version information