Rebase against 8b1737c0fdf1d3d905bea281d9241f1f48f333e9.

This commit is contained in:
Sebastian Lackner
2017-04-10 07:36:39 +02:00
parent 25bd49ecb6
commit e4ac3ea735
12 changed files with 122 additions and 328 deletions

View File

@@ -1,4 +1,4 @@
From 9b4d4c9b2097f3134cc276dedfe8804475dcdfa6 Mon Sep 17 00:00:00 2001
From 0c19e06c3931da74e58127739817d2443d8021f8 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.
@@ -58,10 +58,10 @@ 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 54f5377106..bcf4f68a57 100644
index fd94e58476..d96a2df1eb 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -4957,6 +4957,65 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device)
@@ -5309,6 +5309,65 @@ static void test_effect_preshader_relative_addressing(IDirect3DDevice9 *device)
effect->lpVtbl->Release(effect);
}
@@ -127,10 +127,10 @@ index 54f5377106..bcf4f68a57 100644
START_TEST(effect)
{
HWND wnd;
@@ -5002,6 +5061,7 @@ START_TEST(effect)
test_effect_isparameterused(device);
@@ -5355,6 +5414,7 @@ START_TEST(effect)
test_effect_out_of_bounds_selector(device);
test_effect_commitchanges(device);
test_effect_preshader_relative_addressing(device);
+ test_effect_technique_validation(device);
count = IDirect3DDevice9_Release(device);