Christian Costa : d3drm: Pass mesh builder color to newly created mesh.
Alexandre Julliard
julliard at winehq.org
Tue Jun 5 14:46:54 CDT 2012
Module: wine
Branch: master
Commit: 23db9d8bedd258c3649a5684db20b0ce3b0fa197
URL: http://source.winehq.org/git/wine.git/?a=commit;h=23db9d8bedd258c3649a5684db20b0ce3b0fa197
Author: Christian Costa <titan.costa at gmail.com>
Date: Mon Jun 4 19:31:08 2012 +0200
d3drm: Pass mesh builder color to newly created mesh.
---
dlls/d3drm/meshbuilder.c | 2 ++
dlls/d3drm/tests/d3drm.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index dabea1f..f3f00c1 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -2022,6 +2022,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil
}
}
if (SUCCEEDED(hr))
+ hr = IDirect3DRMMesh_SetGroupColor(*mesh, 0, This->color);
+ if (SUCCEEDED(hr))
hr = IDirect3DRMMesh_SetGroupMaterial(*mesh, 0, (LPDIRECT3DRMMATERIAL)This->material);
if (FAILED(hr))
IDirect3DRMMesh_Release(*mesh);
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 54a356a..f351b02 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -369,7 +369,7 @@ static void test_MeshBuilder(void)
todo_wine ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices);
todo_wine ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size);
color = IDirect3DRMMesh_GetGroupColor(mesh, 0);
- todo_wine ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00);
+ ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00);
hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture);
ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr);
ok(texture == NULL, "No texture should be present\n");
More information about the wine-cvs
mailing list