Andrey Gusev : d3dx11: Move D3DX11CreateTextureFromMemory to texture.c.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b8140565990886cc90604d993c48ac4efe59031e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b8140565990886cc90604d993c...

Author: Andrey Gusev 
Date:   Fri Nov  4 15:43:22 2016 +0100

d3dx11: Move D3DX11CreateTextureFromMemory to texture.c.

Signed-off-by: Andrey Gusev 
Signed-off-by: Matteo Bruni 
Signed-off-by: Alexandre Julliard

---

dlls/d3dx11_43/async.c   | 10 ----------
 dlls/d3dx11_43/texture.c | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c
index 6eb2a10..b33c235 100644
--- a/dlls/d3dx11_43/async.c
+++ b/dlls/d3dx11_43/async.c
@@ -65,13 +65,3 @@ HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_

return E_NOTIMPL;
 }
-
-HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data,
-        SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
-        ID3D11Resource **texture, HRESULT *hresult)
-{
-    FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n",
-            device, data, data_size, load_info, pump, texture, hresult);
-
-    return E_NOTIMPL;
-}
diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
index 832f64f..65598a6 100644
--- a/dlls/d3dx11_43/texture.c
+++ b/dlls/d3dx11_43/texture.c
@@ -25,6 +25,16 @@

WINE_DEFAULT_DEBUG_CHANNEL(d3dx);

+HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data,
+        SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
+        ID3D11Resource **texture, HRESULT *hresult)
+{
+    FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n",
+            device, data, data_size, load_info, pump, texture, hresult);
+
+    return E_NOTIMPL;
+}
+
 HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Resource *texture,
         D3DX11_IMAGE_FILE_FORMAT format, ID3D10Blob **buffer, UINT flags)
 {