Rebase against 9d897b73a877e5eaae26df87930c951ff8273c14

patches/d3dx9_36-D3DXDisassembleShader/0004-d3dx9_36-Implement-D3DXDisassembleShader.patch

@@ -1,28 +1,27 @@
-From ac716fe03fbbe45d9128e4e31c5654b9049c59aa Mon Sep 17 00:00:00 2001
+From fb8bd7d53bea2e6deb38994741d884eb10bc31ad Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sat, 13 Feb 2016 15:29:37 +0100
-Subject: d3dx9_36: Implement D3DXDisassembleShader. (v2)
+Subject: [PATCH] d3dx9_36: Implement D3DXDisassembleShader. (v2)
 
 Changes in v2 (by Christian Costa):
   * More generic code for D3DXDisassembleShader.
 ---
- dlls/d3dx9_36/shader.c | 331 ++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 328 insertions(+), 3 deletions(-)
+ dlls/d3dx9_36/shader.c | 330 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 328 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
-index e3924a9..34a98aa 100644
+index f372494..01ed335 100644
 --- a/dlls/d3dx9_36/shader.c
 +++ b/dlls/d3dx9_36/shader.c
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,7 @@
  /*
   * Copyright 2008 Luis Busquets
   * Copyright 2009 Matteo Bruni
-- * Copyright 2010, 2013 Christian Costa
 + * Copyright 2010, 2013, 2016 Christian Costa
   * Copyright 2011 Travis Athougies
   *
   * This library is free software; you can redistribute it and/or
-@@ -21,6 +21,7 @@
+@@ -20,6 +21,7 @@
  
  #include "config.h"
  #include "wine/port.h"
@@ -30,7 +29,7 @@ index e3924a9..34a98aa 100644
  
  #include "d3dx9_private.h"
  #include "d3dcommon.h"
-@@ -2142,10 +2143,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
+@@ -2144,10 +2146,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
      return D3D_OK;
  }
  
@@ -368,5 +367,5 @@ index e3924a9..34a98aa 100644
  
  struct d3dx9_texture_shader
 -- 
-2.8.0
+1.9.1
 

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

@@ -1,18 +1,18 @@
-From 9dec4fdb1b9f89a5709603247fc8c6bf52eff764 Mon Sep 17 00:00:00 2001
+From 44260ce08c1291f1c2e6806ae2cccb8df50890df Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 15 Feb 2016 08:25:58 +0100
-Subject: d3dx9_36/tests: Add initial tests for D3DXDisassembleShader.
+Subject: [PATCH] d3dx9_36/tests: Add initial tests for D3DXDisassembleShader.
 
 ---
  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 946143e..b12bf5b 100644
+index 2f01a46..dd26f58 100644
 --- a/dlls/d3dx9_36/tests/shader.c
 +++ b/dlls/d3dx9_36/tests/shader.c
-@@ -6628,6 +6628,51 @@ if (0)
-     ok(semantics[0].UsageIndex == 0, "Got %u, expected 0\n", semantics[0].UsageIndex);
+@@ -6651,6 +6651,51 @@ static void test_shader_semantics(void)
+     }
  }
  
 +static void test_disassemble_shader(void)
@@ -63,12 +63,12 @@ index 946143e..b12bf5b 100644
  START_TEST(shader)
  {
      test_get_shader_size();
-@@ -6642,4 +6687,5 @@ START_TEST(shader)
+@@ -6665,4 +6710,5 @@ START_TEST(shader)
      test_registerset();
      test_registerset_defaults();
-     test_get_shader_semantics();
+     test_shader_semantics();
 +    test_disassemble_shader();
  }
 -- 
-2.7.1
+1.9.1
 

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

@@ -1,18 +1,18 @@
-From 01824b066e4d25ae049d924657d9c074bcb81344 Mon Sep 17 00:00:00 2001
+From 6f28c9154b40e00b0e582a54910f3f88fd05a510 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Tue, 16 Feb 2016 12:11:45 +0100
-Subject: d3dx9_36/tests: Add additional tests for special cases.
+Subject: [PATCH] d3dx9_36/tests: Add additional tests for special cases.
 
 ---
  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 b12bf5b..6bb6bda 100644
+index dd26f58..44cc441 100644
 --- a/dlls/d3dx9_36/tests/shader.c
 +++ b/dlls/d3dx9_36/tests/shader.c
-@@ -6628,6 +6628,60 @@ if (0)
-     ok(semantics[0].UsageIndex == 0, "Got %u, expected 0\n", semantics[0].UsageIndex);
+@@ -6651,6 +6651,60 @@ static void test_shader_semantics(void)
+     }
  }
  
 +static const DWORD ps_tex[] = {
@@ -72,7 +72,7 @@ index b12bf5b..6bb6bda 100644
  static void test_disassemble_shader(void)
  {
      static const char disasm_vs[] = "    vs_1_1\n"
-@@ -6642,6 +6696,33 @@ static void test_disassemble_shader(void)
+@@ -6665,6 +6719,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 b12bf5b..6bb6bda 100644
      ID3DXBuffer *disassembly;
      HRESULT ret;
      char *ptr;
-@@ -6671,6 +6752,88 @@ static void test_disassemble_shader(void)
+@@ -6694,6 +6775,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 b12bf5b..6bb6bda 100644
  
  START_TEST(shader)
 -- 
-2.7.1
+1.9.1