Rebase against 1d9a3f6d12322891a2af4aadd66a92ea66479233.

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

@@ -1,4 +1,4 @@
-From fb8bd7d53bea2e6deb38994741d884eb10bc31ad Mon Sep 17 00:00:00 2001
+From 27517cacf7df657e32e7ca7068c3e86723cb4a3c Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sat, 13 Feb 2016 15:29:37 +0100
 Subject: [PATCH] d3dx9_36: Implement D3DXDisassembleShader. (v2)
@@ -6,11 +6,11 @@ Subject: [PATCH] d3dx9_36: Implement D3DXDisassembleShader. (v2)
 Changes in v2 (by Christian Costa):
   * More generic code for D3DXDisassembleShader.
 ---
- dlls/d3dx9_36/shader.c | 330 ++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 328 insertions(+), 2 deletions(-)
+ dlls/d3dx9_36/shader.c | 331 ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 328 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
-index f372494..01ed335 100644
+index c59fc791e..79d47b95c 100644
 --- a/dlls/d3dx9_36/shader.c
 +++ b/dlls/d3dx9_36/shader.c
 @@ -1,6 +1,7 @@
@@ -21,15 +21,16 @@ index f372494..01ed335 100644
   * Copyright 2011 Travis Athougies
   *
   * This library is free software; you can redistribute it and/or
-@@ -20,6 +21,7 @@
+@@ -18,7 +19,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
  
- #include "config.h"
- #include "wine/port.h"
+-
 +#include <stdio.h>
- 
  #include "d3dx9_private.h"
  #include "d3dcommon.h"
-@@ -2144,10 +2146,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
+ #include "d3dcompiler.h"
+@@ -2138,10 +2139,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
      return D3D_OK;
  }
  
@@ -367,5 +368,5 @@ index f372494..01ed335 100644
  
  struct d3dx9_texture_shader
 -- 
-1.9.1
+2.21.0