Skip to content

W
wine-winehq
Commit 39b60870 authored by Christian Costa's avatar Christian Costa Committed by Alexandre Julliard
Browse files
Options

d3dx9_36: Implement D3DXCreateEffectEx and make D3DXCreateEffect use it.

parent 947fe3a5
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 11 deletions
dlls/d3dx9_36/effect.c
View file @ 39b60870
...@@ -848,20 +848,21 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl = ...@@ -848,20 +848,21 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl =
ID3DXEffectImpl_SetRawValue ID3DXEffectImpl_SetRawValue
}; };
HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device,
LPCVOID srcdata, LPCVOID srcdata,
UINT srcdatalen, UINT srcdatalen,
CONST D3DXMACRO* defines, CONST D3DXMACRO* defines,
LPD3DXINCLUDE include, LPD3DXINCLUDE include,
DWORD flags, LPCSTR skip_constants,
LPD3DXEFFECTPOOL pool, DWORD flags,
LPD3DXEFFECT* effect, LPD3DXEFFECTPOOL pool,
LPD3DXBUFFER* compilation_errors) LPD3DXEFFECT* effect,
LPD3DXBUFFER* compilation_errors)
{ {
ID3DXEffectImpl* object; ID3DXEffectImpl* object;
FIXME("(%p, %p, %u, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include, flags, FIXME("(%p, %p, %u, %p, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include,
pool, effect, compilation_errors); skip_constants, flags, pool, effect, compilation_errors);
if (!device || !srcdata) if (!device || !srcdata)
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
...@@ -888,6 +889,22 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, ...@@ -888,6 +889,22 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device,
return D3D_OK; return D3D_OK;
} }
HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device,
LPCVOID srcdata,
UINT srcdatalen,
CONST D3DXMACRO* defines,
LPD3DXINCLUDE include,
DWORD flags,
LPD3DXEFFECTPOOL pool,
LPD3DXEFFECT* effect,
LPD3DXBUFFER* compilation_errors)
{
TRACE("(%p, %p, %u, %p, %p, %#x, %p, %p, %p): Forwarded to D3DXCreateEffectEx\n", device, srcdata, srcdatalen, defines,
include, flags, pool, effect, compilation_errors);
return D3DXCreateEffectEx(device, srcdata, srcdatalen, defines, include, NULL, flags, pool, effect, compilation_errors);
}
HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata,
UINT srcdatalen, UINT srcdatalen,
CONST D3DXMACRO* defines, CONST D3DXMACRO* defines,
......
include/d3dx9effect.h
View file @ 39b60870
...@@ -368,6 +368,17 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, ...@@ -368,6 +368,17 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device,
LPD3DXEFFECT* effect, LPD3DXEFFECT* effect,
LPD3DXBUFFER* compilation_errors); LPD3DXBUFFER* compilation_errors);
HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device,
LPCVOID srcdata,
UINT srcdatalen,
CONST D3DXMACRO* defines,
LPD3DXINCLUDE include,
LPCSTR skip_constants,
DWORD flags,
LPD3DXEFFECTPOOL pool,
LPD3DXEFFECT* effect,
LPD3DXBUFFER* compilation_errors);
HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata,
UINT srcdatalen, UINT srcdatalen,
CONST D3DXMACRO* defines, CONST D3DXMACRO* defines,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment