wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Some small formatting fixes in multiple patches.

Browse Source
This commit is contained in:
Sebastian Lackner
2014-10-17 22:20:23 +02:00
parent 291d4468f7
commit b7668e1d7a
4 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch
View File

@@ -1,4 +1,4 @@
From be168cfe86d540b42e070011ea824138069a32f9 Mon Sep 17 00:00:00 2001
From 33e4e3219056f09ed8b406d154b87bafedb1ebe0 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Mon, 22 Jul 2013 21:51:20 +0200
Subject: d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh.
@@ -6,8 +6,8 @@ Subject: d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh.
This patch fixes last problem of bug 32572.
---
dlls/d3dx9_36/skin.c | 86 ++++++++++++++++++++++++++++++++++++++++++++--
dlls/d3dx9_36/tests/mesh.c | 84 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 167 insertions(+), 3 deletions(-)
dlls/d3dx9_36/tests/mesh.c | 83 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 166 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c
index aa5acf2..bd7e581 100644
@@ -115,10 +115,10 @@ index aa5acf2..bd7e581 100644
static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in,
diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
index 17c5d9c..944a739 100644
index 17c5d9c..e255eac 100644
--- a/dlls/d3dx9_36/tests/mesh.c
+++ b/dlls/d3dx9_36/tests/mesh.c
@@ -5152,6 +5152,89 @@ static void test_create_skin_info(void)
@@ -5152,6 +5152,88 @@ static void test_create_skin_info(void)
ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);
}
@@ -201,14 +201,13 @@ index 17c5d9c..944a739 100644
+ ok(compare(vertices_dest[i*2+1].z, vertices_ref[i*2+1].z), "Vertex[%d].normal.z: got %g, expected %g\n",
+ i, vertices_dest[i*2+1].z, vertices_ref[i*2+1].z);
+ }
+ ok(TRUE,"\n");
+ skin_info->lpVtbl->Release(skin_info);
+}
+
static void test_convert_adjacency_to_point_reps(void)
{
HRESULT hr;
@@ -10468,6 +10551,7 @@ START_TEST(mesh)
@@ -10468,6 +10550,7 @@ START_TEST(mesh)
D3DXGenerateAdjacencyTest();
test_update_semantics();
test_create_skin_info();
@@ -217,5 +216,5 @@ index 17c5d9c..944a739 100644
test_convert_point_reps_to_adjacency();
test_weld_vertices();
--
1.9.1
2.1.2