Alistair Leslie-Hughes : d3dx9_36: Add D3DXCreateFragmentLinker, D3DXCreateFragmentLinkerEx stubs.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jul 31 17:25:54 CDT 2015
Module: wine
Branch: master
Commit: d55fe1f9ce700af5b13712b7283b6f3356be8c20
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55fe1f9ce700af5b13712b7283b6f3356be8c20
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Wed Jul 29 16:23:10 2015 +1000
d3dx9_36: Add D3DXCreateFragmentLinker, D3DXCreateFragmentLinkerEx stubs.
---
dlls/d3dx9_36/d3dx9_36.spec | 4 ++--
dlls/d3dx9_36/shader.c | 21 +++++++++++++++++++++
dlls/d3dx9_42/d3dx9_42.spec | 2 --
include/d3dx9shader.h | 3 +++
4 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index aa99dd2..7e95e35 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -66,8 +66,8 @@
@ stdcall D3DXCreateFontIndirectA(ptr ptr ptr)
@ stdcall D3DXCreateFontIndirectW(ptr ptr ptr)
@ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr)
-@ stub D3DXCreateFragmentLinker(ptr long ptr)
-@ stub D3DXCreateFragmentLinkerEx(ptr long long ptr)
+@ stdcall D3DXCreateFragmentLinker(ptr long ptr)
+@ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr)
@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr)
@ stdcall D3DXCreateLine(ptr ptr)
@ stdcall D3DXCreateMatrixStack(long ptr)
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index cdc470b..12d0bcb 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -2077,6 +2077,27 @@ HRESULT WINAPI D3DXGetShaderConstantTable(const DWORD *byte_code, ID3DXConstantT
return D3DXGetShaderConstantTableEx(byte_code, 0, constant_table);
}
+HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker)
+{
+ FIXME("device %p, size %u, linker %p: stub.\n", device, size, linker);
+
+ if (linker)
+ *linker = NULL;
+
+
+ return E_NOTIMPL;
+}
+
+HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, ID3DXFragmentLinker **linker)
+{
+ FIXME("device %p, size %u, flags %#x, linker %p: stub.\n", device, size, flags, linker);
+
+ if (linker)
+ *linker = NULL;
+
+ return E_NOTIMPL;
+}
+
HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count)
{
UINT i, sampler_count = 0;
diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec
index d58faba..efe673d 100644
--- a/dlls/d3dx9_42/d3dx9_42.spec
+++ b/dlls/d3dx9_42/d3dx9_42.spec
@@ -66,8 +66,6 @@
@ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) d3dx9_36.D3DXCreateFontIndirectA
@ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) d3dx9_36.D3DXCreateFontIndirectW
@ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) d3dx9_36.D3DXCreateFontW
-@ stdcall D3DXCreateFragmentLinker(ptr long ptr) d3dx9_36.D3DXCreateFragmentLinker
-@ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) d3dx9_36.D3DXCreateFragmentLinkerEx
@ stdcall D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) d3dx9_36.D3DXCreateKeyframedAnimationSet
@ stdcall D3DXCreateLine(ptr ptr) d3dx9_36.D3DXCreateLine
@ stdcall D3DXCreateMatrixStack(long ptr) d3dx9_36.D3DXCreateMatrixStack
diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h
index 99519cb..a3f68f2 100644
--- a/include/d3dx9shader.h
+++ b/include/d3dx9shader.h
@@ -414,6 +414,9 @@ HRESULT WINAPI D3DXGetShaderOutputSemantics(const DWORD *pFunction, D3DXSEMANTIC
HRESULT WINAPI D3DXCreateTextureShader(const DWORD *pFunction, ID3DXTextureShader **ppTextureShader);
+HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker);
+HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, ID3DXFragmentLinker **linker);
+
#ifdef __cplusplus
}
#endif
More information about the wine-cvs
mailing list