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 917e86dd7a4cca1da47262caaded2bef9e022f99.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-09-09 00:10:28 +02:00
parent 36f5d4da6c
commit f85692946e
10 changed files with 23 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 4615fc9e392d8942286b4cb40482a6ede5ad6d59 Mon Sep 17 00:00:00 2001
From 73498c6ee55422b032f7a0e3c2329254a810e5d3 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,11 +9,11 @@ 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 2cd0c22f646..6c30eb78640 100644
index ce2e5d86e5f..0f2f9cfd2d7 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3948,13 +3948,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
return D3D_OK;
@@ -3984,13 +3984,41 @@ done:
return ret;
}
-static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect* iface, D3DXHANDLE technique, D3DXHANDLE* next_technique)
@@ -58,10 +58,10 @@ index 2cd0c22f646..6c30eb78640 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 bb26fe4e515..a7ce30dd65e 100644
index 96b21f0454c..6b81582ab7e 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -7162,6 +7162,65 @@ static void test_effect_unsupported_shader(void)
@@ -7281,6 +7281,65 @@ static void test_effect_null_shader(void)
DestroyWindow(window);
}
@@ -127,14 +127,14 @@ index bb26fe4e515..a7ce30dd65e 100644
START_TEST(effect)
{
HWND wnd;
@@ -7215,6 +7274,7 @@ START_TEST(effect)
@@ -7333,6 +7392,7 @@ START_TEST(effect)
test_effect_large_address_aware_flag(device);
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);
refcount = IDirect3DDevice9_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);
--
2.14.1