wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 692656467729c5548c45244aa05ca946620afa72.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-04-12 07:03:43 +02:00
parent e5d2247213
commit b113596b6c
5 changed files with 198 additions and 319 deletions
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 0c19e06c3931da74e58127739817d2443d8021f8 Mon Sep 17 00:00:00 2001
From 07bb6e9c60e3525ccf70f979d60f045e4300dbc4 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 76580417e9..fd9c4bd1aa 100644
index 813b57e1ea..3c5f7ba8b8 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3631,13 +3631,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
@@ -3652,13 +3652,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
return D3D_OK;
}
@@ -58,11 +58,11 @@ index 76580417e9..fd9c4bd1aa 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 fd94e58476..d96a2df1eb 100644
index de5ae69ec9..aba65d11fd 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -5309,6 +5309,65 @@ static void test_effect_preshader_relative_addressing(IDirect3DDevice9 *device)
effect->lpVtbl->Release(effect);
@@ -5681,6 +5681,65 @@ static void test_effect_state_manager(IDirect3DDevice9 *device)
ok(!refcount, "State manager was not properly freed, refcount %u.\n", refcount);
}
+/*
@@ -127,10 +127,10 @@ index fd94e58476..d96a2df1eb 100644
START_TEST(effect)
{
HWND wnd;
@@ -5355,6 +5414,7 @@ START_TEST(effect)
test_effect_out_of_bounds_selector(device);
@@ -5728,6 +5787,7 @@ START_TEST(effect)
test_effect_commitchanges(device);
test_effect_preshader_relative_addressing(device);
test_effect_state_manager(device);
+ test_effect_technique_validation(device);
count = IDirect3DDevice9_Release(device);