https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f23b53d642561bedd8840d5913d1f99eed550fd4
commit f23b53d642561bedd8840d5913d1f99eed550fd4 Author: winesync <[email protected]> AuthorDate: Mon Sep 21 22:40:26 2020 +0200 Commit: Jérôme Gardou <[email protected]> CommitDate: Thu Feb 4 16:37:02 2021 +0100 [WINESYNC] d3dx9: Merge the d3dx_effect_GetTechnique() helper. Signed-off-by: Michael Stefaniuc <[email protected]> Signed-off-by: Matteo Bruni <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id a33b20a0604e29c4b502a0d77e8828e926b09a62 by Michael Stefaniuc <[email protected]> --- dll/directx/wine/d3dx9_36/effect.c | 23 +++++++++-------------- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index 11fda776c6a..fe12d21e5d5 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -1161,19 +1161,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static D3DXHANDLE d3dx9_base_effect_get_technique(struct d3dx9_base_effect *base, UINT index) -{ - if (index >= base->technique_count) - { - WARN("Invalid argument specified.\n"); - return NULL; - } - - TRACE("Returning technique %p.\n", &base->techniques[index]); - - return get_technique_handle(&base->techniques[index]); -} - static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -3360,7 +3347,15 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index TRACE("iface %p, index %u.\n", iface, index); - return d3dx9_base_effect_get_technique(&effect->base_effect, index); + if (index >= effect->base_effect.technique_count) + { + WARN("Invalid argument specified.\n"); + return NULL; + } + + TRACE("Returning technique %p.\n", &effect->base_effect.techniques[index]); + + return get_technique_handle(&effect->base_effect.techniques[index]); } static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index e0f4567a1c5..3aa09dd319e 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h, include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h, include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h} -tags: {wine: a2e0046fc52c4e08a64cbe76c78f184e7d5b27d2} +tags: {wine: a33b20a0604e29c4b502a0d77e8828e926b09a62}
