From d83b9f53fb8b3f8c76bbb93c2b742cb5bd79eed7 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 29 Jan 2020 12:02:22 +1100 Subject: [PATCH] Updated d3dx9_36-D3DXCreateKeyframedAnimationSet patchset --- ..._36-Implement-D3DXCreateKeyframedAnimationSet.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/d3dx9_36-D3DXCreateKeyframedAnimationSet/0001-d3dx9_36-Implement-D3DXCreateKeyframedAnimationSet.patch b/patches/d3dx9_36-D3DXCreateKeyframedAnimationSet/0001-d3dx9_36-Implement-D3DXCreateKeyframedAnimationSet.patch index 3fceefbb..4049a389 100644 --- a/patches/d3dx9_36-D3DXCreateKeyframedAnimationSet/0001-d3dx9_36-Implement-D3DXCreateKeyframedAnimationSet.patch +++ b/patches/d3dx9_36-D3DXCreateKeyframedAnimationSet/0001-d3dx9_36-Implement-D3DXCreateKeyframedAnimationSet.patch @@ -1,4 +1,4 @@ -From 953112b017a794a550491f0008d599bd78b37dd0 Mon Sep 17 00:00:00 2001 +From a5e6898b23b0c163eebb4e88b48030fe19152116 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 1 Jul 2019 15:40:59 +1000 Subject: [PATCH] d3dx9_36: Implement D3DXCreateKeyframedAnimationSet @@ -11,7 +11,7 @@ Signed-off-by: Alistair Leslie-Hughes 2 files changed, 394 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c -index de6d69d383..4828f2b8d0 100644 +index de6d69d383..6b3a79b296 100644 --- a/dlls/d3dx9_36/animation.c +++ b/dlls/d3dx9_36/animation.c @@ -468,14 +468,378 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets, @@ -295,7 +295,7 @@ index de6d69d383..4828f2b8d0 100644 +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, name %s, num_scale_keys %u, num_rotation_keys %u, rotation_keys %p, num_translation_keys %u, scale_keys %p, " -+ "rotation_keys %u, translation_keys %p, animation_index %p stub.\n", ++ "rotation_keys %p, translation_keys %p, animation_index %p stub.\n", + framed, debugstr_a(name), num_scale_keys, num_rotation_keys, rotation_keys, num_translation_keys, scale_keys, + rotation_keys, translation_keys, animation_index); + return E_NOTIMPL; @@ -397,7 +397,7 @@ index de6d69d383..4828f2b8d0 100644 + return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c -index da9b80c578..b75e3fce85 100644 +index 3882bb404a..fc07ac1228 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -11119,6 +11119,32 @@ static void D3DXCreateAnimationControllerTest(void) @@ -442,5 +442,5 @@ index da9b80c578..b75e3fce85 100644 test_get_decl_vertex_size(); test_fvf_decl_conversion(); -- -2.17.1 +2.24.1