From 83504ec21a3825137fe3a9dd449d75309fb9c9c4 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 29 Sep 2023 18:11:07 +1000 Subject: [PATCH] Rebase against 9e0487c4cc36cdbf915d35222c875d23f54958ae. --- ...Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch | 12 ++++++------ staging/upstream-commit | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch b/patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch index 74ff4e86..ee448519 100644 --- a/patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch +++ b/patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch @@ -174,18 +174,18 @@ index 1daec158a5f..64b02276843 100644 + } + + hr = D3DXCreateSkinInfoFVF(4, D3DFVF_XYZ | D3DFVF_NORMAL, 2, &skin_info); -+ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); + + skin_info->lpVtbl->SetBoneInfluence(skin_info, 0, 2, bone0_vertices, bone0_weights); -+ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); + skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 0, &matrix); -+ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); + skin_info->lpVtbl->SetBoneInfluence(skin_info, 1, 2, bone1_vertices, bone1_weights); -+ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); + skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 1, &matrix); -+ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); + skin_info->lpVtbl->UpdateSkinnedMesh(skin_info, bones_matrix, NULL, vertices_src, vertices_dest); -+ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); + for (i = 0; i < 4; i++) + { + ok(compare(vertices_dest[i*2].x, vertices_ref[i*2].x), "Vertex[%d].position.x: got %g, expected %g\n", diff --git a/staging/upstream-commit b/staging/upstream-commit index 983ecb80..1730324b 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -416a273241e6eb7a8d15380387fef00e159b7277 +9e0487c4cc36cdbf915d35222c875d23f54958ae