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 f7402accc40b66140be4d27c5ad1b2fee8532dfc.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-04-20 02:16:00 +02:00
parent a65b6fa780
commit bd070a400c
6 changed files with 86 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 07bb6e9c60e3525ccf70f979d60f045e4300dbc4 Mon Sep 17 00:00:00 2001
From 2f29ecad409dd3dc746c0fbb3bb5eda00c0c9a3d 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 813b57e1ea..3c5f7ba8b8 100644
index 8dc4738360..47e79a689a 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3652,13 +3652,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
@@ -3667,13 +3667,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
return D3D_OK;
}
@@ -58,11 +58,11 @@ index 813b57e1ea..3c5f7ba8b8 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 de5ae69ec9..aba65d11fd 100644
index 9c318b49ef..b8da7bc88f 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -5681,6 +5681,65 @@ static void test_effect_state_manager(IDirect3DDevice9 *device)
ok(!refcount, "State manager was not properly freed, refcount %u.\n", refcount);
@@ -5744,6 +5744,65 @@ static void test_cross_effect_handle(IDirect3DDevice9 *device)
effect1->lpVtbl->Release(effect1);
}
+/*
@@ -127,14 +127,14 @@ index de5ae69ec9..aba65d11fd 100644
START_TEST(effect)
{
HWND wnd;
@@ -5728,6 +5787,7 @@ START_TEST(effect)
test_effect_commitchanges(device);
@@ -5792,6 +5851,7 @@ START_TEST(effect)
test_effect_preshader_relative_addressing(device);
test_effect_state_manager(device);
test_cross_effect_handle(device);
+ test_effect_technique_validation(device);
count = IDirect3DDevice9_Release(device);
ok(count == 0, "The device was not properly freed: refcount %u\n", count);
--
2.11.0
2.12.2