d3dx9_36-GetShaderSemantics: Rebase against upstream changes.

patches/d3dx9_36-GetShaderSemantics/0001-d3dx9_36-Implement-D3DXGetShaderInputSemantics-tests.patch

@@ -1,4 +1,4 @@
-From 2ef3087d876425c688c4b6cda1ab7b7689bf5252 Mon Sep 17 00:00:00 2001
+From b514784351ed8c2bc33cb0238ab81b4eedf29308 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sat, 5 Apr 2014 14:02:07 +0200
 Subject: d3dx9_36: Implement D3DXGetShaderInputSemantics + tests. (rev 2)
@@ -12,7 +12,7 @@ Fixes bug 22682.
  4 files changed, 183 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
-index 13f0d99..1fb2aaf 100644
+index 15d693c..9b55d21 100644
 --- a/dlls/d3dx9_36/d3dx9_36.spec
 +++ b/dlls/d3dx9_36/d3dx9_36.spec
 @@ -159,7 +159,7 @@
@@ -25,7 +25,7 @@ index 13f0d99..1fb2aaf 100644
  @ stdcall D3DXGetShaderSamplers(ptr ptr ptr)
  @ stdcall D3DXGetShaderSize(ptr)
 diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
-index 5ea3d13..ff03fd6 100644
+index c66936d..62aaa5b 100644
 --- a/dlls/d3dx9_36/shader.c
 +++ b/dlls/d3dx9_36/shader.c
 @@ -1,6 +1,7 @@
@@ -36,9 +36,9 @@ index 5ea3d13..ff03fd6 100644
   * Copyright 2011 Travis Athougies
   *
   * This library is free software; you can redistribute it and/or
-@@ -2126,3 +2127,97 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
- 
-     return D3D_OK;
+@@ -2132,3 +2133,97 @@ HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const
+    FIXME("%p %d %s %p: stub\n", shader, colorcode, debugstr_a(comments), disassembly);
+    return E_OUTOFMEMORY;
  }
 +
 +const DWORD* skip_instruction(const DWORD *byte_code, UINT shader_model)
@@ -262,5 +262,5 @@ index d665f72..f565432 100644
  HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines,
          ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
 -- 
-2.2.2
+2.3.0