ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Merge the d3dx9_effect_GetDesc() helper. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2019-02-28 01:11:32 +01:00 committed by Alexandre Julliard
parent 715b932768
commit 4b85165cdc
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/d3dx9_36/effect.c
View File

@ -991,25 +991,6 @@ static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor)
return (0xfeff0000 | ((major) << 8) | (minor));
}
static HRESULT d3dx9_base_effect_get_desc(struct d3dx9_base_effect *base, D3DXEFFECT_DESC *desc)
{
if (!desc)
{
WARN("Invalid argument specified.\n");
return D3DERR_INVALIDCALL;
}
FIXME("partial stub!\n");
/* TODO: add creator and function count. */
desc->Creator = NULL;
desc->Functions = 0;
desc->Parameters = base->parameter_count;
desc->Techniques = base->technique_count;
return D3D_OK;
}
static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc)
{
@ -3419,9 +3400,21 @@ static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *d
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
TRACE("iface %p, desc %p.\n", iface, desc);
FIXME("iface %p, desc %p partial stub.\n", iface, desc);
return d3dx9_base_effect_get_desc(&effect->base_effect, desc);
if (!desc)
{
WARN("Invalid argument specified.\n");
return D3DERR_INVALIDCALL;
}
/* TODO: add creator and function count. */
desc->Creator = NULL;
desc->Functions = 0;
desc->Parameters = effect->base_effect.parameter_count;
desc->Techniques = effect->base_effect.technique_count;
return D3D_OK;
}
static HRESULT WINAPI d3dx_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDLE parameter,