Rebase against 2935bab96569dcd734a8e855ec9a20ae27c18973

patches/d3dx9_36-D3DXDisassembleShader/0005-d3dx9_36-tests-Add-initial-tests-for-D3DXDisassemble.patch

@@ -1,18 +1,18 @@
-From 44260ce08c1291f1c2e6806ae2cccb8df50890df Mon Sep 17 00:00:00 2001
+From 63a4b93d73acaa55a2246a1b0d825e7950af042b Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 15 Feb 2016 08:25:58 +0100
 Subject: [PATCH] d3dx9_36/tests: Add initial tests for D3DXDisassembleShader.
 
 ---
- dlls/d3dx9_36/tests/shader.c | 46 ++++++++++++++++++++++++++++++++++++++++++++
+ dlls/d3dx9_36/tests/shader.c | 46 ++++++++++++++++++++++++++++++++++++
  1 file changed, 46 insertions(+)
 
 diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c
-index 2f01a46..dd26f58 100644
+index e2925faad6..5edac61ae8 100644
 --- a/dlls/d3dx9_36/tests/shader.c
 +++ b/dlls/d3dx9_36/tests/shader.c
-@@ -6651,6 +6651,51 @@ static void test_shader_semantics(void)
-     }
+@@ -6623,6 +6623,51 @@ static void test_fragment_linker(void)
+     DestroyWindow(window);
  }
  
 +static void test_disassemble_shader(void)
@@ -63,12 +63,12 @@ index 2f01a46..dd26f58 100644
  START_TEST(shader)
  {
      test_get_shader_size();
-@@ -6665,4 +6710,5 @@ START_TEST(shader)
-     test_registerset();
+@@ -6638,4 +6683,5 @@ START_TEST(shader)
      test_registerset_defaults();
      test_shader_semantics();
+     test_fragment_linker();
 +    test_disassemble_shader();
  }
 -- 
-1.9.1
+2.23.0
 

patches/d3dx9_36-D3DXDisassembleShader/0006-d3dx9_36-tests-Add-additional-tests-for-special-case.patch

@@ -1,18 +1,18 @@
-From 6f28c9154b40e00b0e582a54910f3f88fd05a510 Mon Sep 17 00:00:00 2001
+From ce7f2989a9fc4d4d6a307131f08f6ed5570de680 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Tue, 16 Feb 2016 12:11:45 +0100
 Subject: [PATCH] d3dx9_36/tests: Add additional tests for special cases.
 
 ---
- dlls/d3dx9_36/tests/shader.c | 163 +++++++++++++++++++++++++++++++++++++++++++
+ dlls/d3dx9_36/tests/shader.c | 163 +++++++++++++++++++++++++++++++++++
  1 file changed, 163 insertions(+)
 
 diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c
-index dd26f58..44cc441 100644
+index 5edac61ae8..0ae8f27b03 100644
 --- a/dlls/d3dx9_36/tests/shader.c
 +++ b/dlls/d3dx9_36/tests/shader.c
-@@ -6651,6 +6651,60 @@ static void test_shader_semantics(void)
-     }
+@@ -6623,6 +6623,60 @@ static void test_fragment_linker(void)
+     DestroyWindow(window);
  }
  
 +static const DWORD ps_tex[] = {
@@ -72,7 +72,7 @@ index dd26f58..44cc441 100644
  static void test_disassemble_shader(void)
  {
      static const char disasm_vs[] = "    vs_1_1\n"
-@@ -6665,6 +6719,33 @@ static void test_disassemble_shader(void)
+@@ -6637,6 +6691,33 @@ static void test_disassemble_shader(void)
                                      "    dp3 r0, c1, c0\n"
                                      "    mul r0, v0, r0\n"
                                      "    mul r0, t0, r0\n";
@@ -106,7 +106,7 @@ index dd26f58..44cc441 100644
      ID3DXBuffer *disassembly;
      HRESULT ret;
      char *ptr;
-@@ -6694,6 +6775,88 @@ static void test_disassemble_shader(void)
+@@ -6666,6 +6747,88 @@ static void test_disassemble_shader(void)
      ok(!memcmp(ptr, disasm_ps, sizeof(disasm_ps) - 1), /* compare beginning */
         "Returned '%s', expected '%s'\n", ptr, disasm_ps);
      ID3DXBuffer_Release(disassembly);
@@ -196,5 +196,5 @@ index dd26f58..44cc441 100644
  
  START_TEST(shader)
 -- 
-1.9.1
+2.23.0
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "ec9eddf86b144cc0fcf975a9cc864cf08ba84eaf"
+	echo "2935bab96569dcd734a8e855ec9a20ae27c18973"
 }
 
 # Show version information