4 Feb
2021
4 Feb
'21
3:52 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d0164c0a09d2ff8abf7d…
commit 4d0164c0a09d2ff8abf7d7e9060cf14b572a6717
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 23:07:38 2020 +0200
Commit: Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:06 2021 +0100
[WINESYNC] d3dx9: Implement ID3DXSkinInfo_Clone().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48779
Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 35a4093eff75e5bf7fee0dc8d2a708d960b03768 by Gijs Vermeulen
<gijsvrm(a)gmail.com>
---
dll/directx/wine/d3dx9_36/skin.c | 28 ++++++++++++-
modules/rostests/winetests/d3dx9_36/mesh.c | 64 ++++++++++++++++++++++++++----
sdk/tools/winesync/d3dx9.cfg | 2 +-
3 files changed, 83 insertions(+), 11 deletions(-)
diff --git a/dll/directx/wine/d3dx9_36/skin.c b/dll/directx/wine/d3dx9_36/skin.c
index 70c0a6a1229..ea4f45d9b4f 100644
--- a/dll/directx/wine/d3dx9_36/skin.c
+++ b/dll/directx/wine/d3dx9_36/skin.c
@@ -302,9 +302,33 @@ static D3DXMATRIX * WINAPI
d3dx9_skin_info_GetBoneOffsetMatrix(ID3DXSkinInfo *if
static HRESULT WINAPI d3dx9_skin_info_Clone(ID3DXSkinInfo *iface, ID3DXSkinInfo
**skin_info)
{
- FIXME("iface %p, skin_info %p stub!\n", iface, skin_info);
+ struct d3dx9_skin_info *skin = impl_from_ID3DXSkinInfo(iface);
+ unsigned int i;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, skin_info %p.\n", iface, skin_info);
+
+ if (FAILED(hr = D3DXCreateSkinInfo(skin->num_vertices,
skin->vertex_declaration, skin->num_bones, skin_info)))
+ return hr;
+
+ for (i = 0; i < skin->num_bones; ++i)
+ {
+ struct bone *current_bone = &skin->bones[i];
+
+ if (current_bone->name && FAILED(hr =
(*skin_info)->lpVtbl->SetBoneName(*skin_info, i, current_bone->name)))
+ break;
+ if (FAILED(hr = (*skin_info)->lpVtbl->SetBoneOffsetMatrix(*skin_info, i,
¤t_bone->transform)))
+ break;
+ if (current_bone->vertices && current_bone->weights
+ && FAILED(hr =
(*skin_info)->lpVtbl->SetBoneInfluence(*skin_info, i,
current_bone->num_influences,
+ current_bone->vertices, current_bone->weights)))
+ break;
+ }
+
+ if (FAILED(hr))
+ (*skin_info)->lpVtbl->Release(*skin_info);
+
+ return hr;
}
static HRESULT WINAPI d3dx9_skin_info_Remap(ID3DXSkinInfo *iface, DWORD num_vertices,
DWORD *vertex_remap)
diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c
b/modules/rostests/winetests/d3dx9_36/mesh.c
index cc67551ed06..c410162da6f 100644
--- a/modules/rostests/winetests/d3dx9_36/mesh.c
+++ b/modules/rostests/winetests/d3dx9_36/mesh.c
@@ -4966,14 +4966,20 @@ cleanup:
static void test_create_skin_info(void)
{
- HRESULT hr;
- ID3DXSkinInfo *skininfo = NULL;
D3DVERTEXELEMENT9 empty_declaration[] = { D3DDECL_END() };
D3DVERTEXELEMENT9 declaration_out[MAX_FVF_DECL_SIZE];
const D3DVERTEXELEMENT9 declaration_with_nonzero_stream[] = {
{1, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0},
D3DDECL_END()
};
+ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE];
+ DWORD exp_vertices[2], vertices[2];
+ float exp_weights[2], weights[2];
+ const char *exp_string, *string;
+ ID3DXSkinInfo *skininfo = NULL;
+ DWORD exp_fvf, fvf;
+ unsigned int i;
+ HRESULT hr;
hr = D3DXCreateSkinInfo(0, empty_declaration, 0, &skininfo);
ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
@@ -4990,6 +4996,7 @@ static void test_create_skin_info(void)
ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
if (skininfo)
{
+ ID3DXSkinInfo *clone = NULL;
DWORD dword_result;
float flt_result;
const char *string_result;
@@ -5023,6 +5030,10 @@ static void test_create_skin_info(void)
transform = skininfo->lpVtbl->GetBoneOffsetMatrix(skininfo, -1);
ok(transform == NULL, "Expected NULL, got %p\n", transform);
+ hr = skininfo->lpVtbl->Clone(skininfo, &clone);
+ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
+ IUnknown_Release(clone);
+
{
/* test [GS]etBoneOffsetMatrix */
hr = skininfo->lpVtbl->SetBoneOffsetMatrix(skininfo, 1,
&identity_matrix);
@@ -5066,12 +5077,7 @@ static void test_create_skin_info(void)
{
/* test [GS]etBoneInfluence */
- DWORD vertices[2];
- FLOAT weights[2];
- int i;
DWORD num_influences;
- DWORD exp_vertices[2];
- FLOAT exp_weights[2];
/* vertex and weight arrays untouched when num_influences is 0 */
vertices[0] = 0xdeadbeef;
@@ -5139,14 +5145,17 @@ static void test_create_skin_info(void)
ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
ok(vertices[0] == 0xdeadbeef, "expected vertex 0xdeadbeef, got
%u\n", vertices[0]);
ok(weights[0] == FLT_MAX, "expected weight %g, got %g\n", FLT_MAX,
weights[0]);
+
+ hr = skininfo->lpVtbl->SetBoneInfluence(skininfo, 0, num_influences,
exp_vertices, exp_weights);
+ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
}
{
/* test [GS]etFVF and [GS]etDeclaration */
D3DVERTEXELEMENT9 declaration_in[MAX_FVF_DECL_SIZE];
- DWORD fvf = D3DFVF_XYZ;
DWORD got_fvf;
+ fvf = D3DFVF_XYZ;
hr = skininfo->lpVtbl->SetDeclaration(skininfo, NULL);
ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got
%#x\n", hr);
@@ -5182,6 +5191,45 @@ static void test_create_skin_info(void)
ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr);
compare_elements(declaration_out, declaration_in, __LINE__, 0);
}
+
+ /* Test Clone() */
+ hr = skininfo->lpVtbl->Clone(skininfo, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+ clone = NULL;
+ hr = skininfo->lpVtbl->Clone(skininfo, &clone);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = clone->lpVtbl->GetDeclaration(clone, declaration);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ compare_elements(declaration, declaration_out, __LINE__, 0);
+
+ hr = D3DXFVFFromDeclarator(declaration_out, &exp_fvf);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ fvf = clone->lpVtbl->GetFVF(clone);
+ ok(fvf == exp_fvf, "Got unexpected fvf %#x.\n", fvf);
+
+ exp_string = skininfo->lpVtbl->GetBoneName(skininfo, 0);
+ string = clone->lpVtbl->GetBoneName(clone, 0);
+ ok(!strcmp(string, exp_string), "Got unexpected bone 0 name %s.\n",
debugstr_a(string));
+
+ transform = clone->lpVtbl->GetBoneOffsetMatrix(clone, 0);
+ check_matrix(transform, &identity_matrix);
+
+ hr = skininfo->lpVtbl->GetBoneInfluence(skininfo, 0, exp_vertices,
exp_weights);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ hr = clone->lpVtbl->GetBoneInfluence(clone, 0, vertices, weights);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+
+ for (i = 0; i < ARRAY_SIZE(vertices); ++i)
+ {
+ ok(vertices[i] == exp_vertices[i], "influence[%u]: got unexpected vertex
%u, expected %u.\n",
+ i, vertices[i], exp_vertices[i]);
+ ok(((DWORD *)weights)[i] == ((DWORD *)exp_weights)[i],
+ "influence[%u]: got unexpected weight %.8e, expected
%.8e.\n", i, weights[i], exp_weights[i]);
+ }
+
+ IUnknown_Release(clone);
}
if (skininfo) IUnknown_Release(skininfo);
skininfo = NULL;
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 868488fe995..b8c926c44aa 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: 22970932d014f024fcf7f0f98b1a5384b1b1eb99}
+tags: {wine: 35a4093eff75e5bf7fee0dc8d2a708d960b03768}