Christian Costa : d3drm: Implement IDirect3DRMMeshBuilderX_SetMaterial.
Alexandre Julliard
julliard at winehq.org
Wed Jun 6 15:35:20 CDT 2012
Module: wine
Branch: master
Commit: 6aa77edfb3d9e82871b77cd037aa48ba56afb16c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa77edfb3d9e82871b77cd037aa48ba56afb16c
Author: Christian Costa <titan.costa at gmail.com>
Date: Tue Jun 5 22:45:44 2012 +0200
d3drm: Implement IDirect3DRMMeshBuilderX_SetMaterial.
---
dlls/d3drm/meshbuilder.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index 0f39b4a..bdb5e00 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -651,13 +651,13 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetTexture(IDirect3DRMMeshBuil
}
static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetMaterial(IDirect3DRMMeshBuilder2* iface,
- LPDIRECT3DRMMATERIAL pMaterial)
+ LPDIRECT3DRMMATERIAL material)
{
IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface);
- FIXME("(%p)->(%p): stub\n", This, pMaterial);
+ TRACE("(%p)->(%p)\n", This, material);
- return E_NOTIMPL;
+ return IDirect3DRMMeshBuilder3_SetMaterial(&This->IDirect3DRMMeshBuilder3_iface, (LPDIRECT3DRMMATERIAL2)material);
}
static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetTextureTopology(IDirect3DRMMeshBuilder2* iface,
@@ -1756,9 +1756,15 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetMaterial(IDirect3DRMMeshBui
{
IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface);
- FIXME("(%p)->(%p): stub\n", This, material);
+ TRACE("(%p)->(%p)\n", This, material);
- return E_NOTIMPL;
+ if (material)
+ IDirect3DRMTexture2_AddRef(material);
+ if (This->material)
+ IDirect3DRMTexture2_Release(This->material);
+ This->material = material;
+
+ return D3DRM_OK;
}
static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetTextureTopology(IDirect3DRMMeshBuilder3* iface,
More information about the wine-cvs
mailing list