Rebase against cced5dfbde8b685022dd74e666f8ad4ea8473453.

This commit is contained in:
Sebastian Lackner
2017-04-22 14:57:30 +02:00
parent 89777bdb23
commit 075da187c7
4 changed files with 45 additions and 46 deletions

View File

@@ -1,4 +1,4 @@
From 2f29ecad409dd3dc746c0fbb3bb5eda00c0c9a3d Mon Sep 17 00:00:00 2001
From 56e710b3d2b2631ee63eb1ed076a2a8af99352ad 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,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 9c318b49ef..b8da7bc88f 100644
index b1f7f3ef26..95d29d0155 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -5744,6 +5744,65 @@ static void test_cross_effect_handle(IDirect3DDevice9 *device)
effect1->lpVtbl->Release(effect1);
@@ -6111,6 +6111,65 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device)
ok(!refcount, "Effect pool was not properly freed, refcount %u.\n", refcount);
}
+/*
@@ -127,10 +127,10 @@ index 9c318b49ef..b8da7bc88f 100644
START_TEST(effect)
{
HWND wnd;
@@ -5792,6 +5851,7 @@ START_TEST(effect)
test_effect_preshader_relative_addressing(device);
@@ -6160,6 +6219,7 @@ START_TEST(effect)
test_effect_state_manager(device);
test_cross_effect_handle(device);
test_effect_shared_parameters(device);
+ test_effect_technique_validation(device);
count = IDirect3DDevice9_Release(device);