Rebase against 10deca7caa60eed55b98a30589c61468f8454e48.

patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch

@@ -1,4 +1,4 @@
-From fcbc8716f358f29b4831c0eaea131ee9e5508435 Mon Sep 17 00:00:00 2001
+From 000f06385dc49a3f2ddc1d866013e7632a6e0370 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 8e2f850..2e06437 100644
+index 4be6e4b..ecd1b74 100644
 --- a/dlls/d3dx9_36/effect.c
 +++ b/dlls/d3dx9_36/effect.c
-@@ -3122,13 +3122,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
+@@ -3471,13 +3471,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
      return D3D_OK;
  }
  
@@ -58,11 +58,11 @@ index 8e2f850..2e06437 100644
  
  static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique)
 diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
-index 482f064..1bac9f0 100644
+index de7d1e9..f34b1f8 100644
 --- a/dlls/d3dx9_36/tests/effect.c
 +++ b/dlls/d3dx9_36/tests/effect.c
-@@ -2692,6 +2692,65 @@ static void test_effect_compilation_errors(IDirect3DDevice9 *device)
-     effect->lpVtbl->Release(effect);
+@@ -2972,6 +2972,65 @@ static void test_effect_states(IDirect3DDevice9 *device)
+     ok(value == 3, "Got result %u, expected %u.\n", value, 1);
  }
  
 +/*
@@ -127,14 +127,14 @@ index 482f064..1bac9f0 100644
  START_TEST(effect)
  {
      HWND wnd;
-@@ -2730,6 +2789,7 @@ START_TEST(effect)
-     test_effect_parameter_value(device);
+@@ -3011,6 +3070,7 @@ START_TEST(effect)
      test_effect_variable_names(device);
      test_effect_compilation_errors(device);
+     test_effect_states(device);
 +    test_effect_technique_validation(device);
  
      count = IDirect3DDevice9_Release(device);
      ok(count == 0, "The device was not properly freed: refcount %u\n", count);
 -- 
-1.9.1
+2.7.1
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "6158405ffdb027fab10456087ee0846c36000a56"
+	echo "10deca7caa60eed55b98a30589c61468f8454e48"
 }
 
 # Show version information