Andrey Gusev : d3dx10: Add D3DX10PreprocessShaderFromMemory stub.

Alexandre Julliard julliard at winehq.org
Thu Nov 9 16:59:59 CST 2017


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

Author: Andrey Gusev <andrey.goosev at gmail.com>
Date:   Thu Nov  9 16:25:05 2017 +0200

d3dx10: Add D3DX10PreprocessShaderFromMemory stub.

Signed-off-by: Andrey Gusev <andrey.goosev at gmail.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3dx10_43/async.c        | 11 +++++++++++
 dlls/d3dx10_43/d3dx10_43.spec |  2 +-
 include/d3dx10async.h         |  4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c
index c638904..c910b4a 100644
--- a/dlls/d3dx10_43/async.c
+++ b/dlls/d3dx10_43/async.c
@@ -397,3 +397,14 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res
 
     return S_OK;
 }
+
+HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename,
+        const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text,
+        ID3D10Blob **errors, HRESULT *hresult)
+{
+    FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, errors %p, "
+            "hresult %p stub!\n",
+            debugstr_a(data), data_size, debugstr_a(filename), defines, include, pump, shader_text, errors, hresult);
+
+    return E_NOTIMPL;
+}
diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec
index 49a6d3a..a36220f 100644
--- a/dlls/d3dx10_43/d3dx10_43.spec
+++ b/dlls/d3dx10_43/d3dx10_43.spec
@@ -57,7 +57,7 @@
 @ stub D3DX10LoadTextureFromTexture(ptr ptr ptr)
 @ stub D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr)
 @ stub D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr)
-@ stub D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr)
+@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr ptr)
 @ stub D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr)
 @ stub D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr)
 @ stub D3DX10SHProjectCubeMap(long ptr ptr ptr ptr)
diff --git a/include/d3dx10async.h b/include/d3dx10async.h
index 6663be4..c8204bc 100644
--- a/include/d3dx10async.h
+++ b/include/d3dx10async.h
@@ -54,6 +54,10 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz
         UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool,
         ID3D10Blob **errors, HRESULT *hresult);
 
+HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename,
+        const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text,
+        ID3D10Blob **errors, HRESULT *hresult);
+
 HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLoader **loader);
 HRESULT WINAPI D3DX10CreateAsyncFileLoaderA(const char *filename, ID3DX10DataLoader **loader);
 HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, ID3DX10DataLoader **loader);




More information about the wine-cvs mailing list