From e7003fd28a81a7ba5907a904f82bed389e26a418 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 1 Apr 2016 17:44:53 +1100 Subject: [PATCH] d3d10: Add D3D10CreateEffectPoolFromMemory stub. Signed-off-by: Alistair Leslie-Hughes Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 8 ++++++++ dlls/d3d10_1/d3d10_1.spec | 2 +- include/d3d10effect.h | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 1e6eb3611c0..db4251115ae 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -4,7 +4,7 @@ @ stdcall D3D10CreateDevice(ptr long ptr long long ptr) @ stdcall D3D10CreateDeviceAndSwapChain(ptr long ptr long long ptr ptr ptr) @ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) -@ stub D3D10CreateEffectPoolFromMemory +@ stdcall D3D10CreateEffectPoolFromMemory(ptr long long ptr ptr) @ stdcall D3D10CreateStateBlock(ptr ptr ptr) @ stub D3D10DisassembleEffect @ stdcall D3D10DisassembleShader(ptr long long ptr ptr) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index e36ec51d753..0f2af0920f4 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -252,6 +252,14 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const return E_NOTIMPL; } +HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, + ID3D10Device *device, ID3D10EffectPool **effect_pool) +{ + FIXME("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p stub.\n", + data, data_size, fx_flags, device, effect_pool); + + return E_NOTIMPL; +} const char * WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) { diff --git a/dlls/d3d10_1/d3d10_1.spec b/dlls/d3d10_1/d3d10_1.spec index 5582558e234..18eb3acabb4 100644 --- a/dlls/d3d10_1/d3d10_1.spec +++ b/dlls/d3d10_1/d3d10_1.spec @@ -5,7 +5,7 @@ @ stdcall D3D10CreateDevice1(ptr long ptr long long long ptr) @ stdcall D3D10CreateDeviceAndSwapChain1(ptr long ptr long long long ptr ptr ptr) @ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) d3d10.D3D10CreateEffectFromMemory -@ stub D3D10CreateEffectPoolFromMemory +@ stdcall D3D10CreateEffectPoolFromMemory(ptr long long ptr ptr) d3d10.D3D10CreateEffectPoolFromMemory @ stdcall D3D10CreateStateBlock(ptr ptr ptr) d3d10.D3D10CreateStateBlock @ stub D3D10DisassembleEffect @ stub D3D10DisassembleShader diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 14948941bd0..b4a33daca48 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -832,6 +832,8 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const ID3D10Blob **effect, ID3D10Blob **errors); HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect); +HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, + ID3D10Device *device, ID3D10EffectPool **effect_pool); HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, D3D10_STATE_BLOCK_MASK *mask, ID3D10StateBlock **stateblock);