Module: wine Branch: master Commit: 5aa43a2bfbad2d25d8669291462d5a292b761394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa43a2bfbad2d25d866929146...
Author: André Hentschel nerv@dawncrow.de Date: Fri Jan 13 00:19:58 2012 +0100
d3drm: Move GetTextureCoordinates from IDirect3DRMMeshBuilder2 to IDirect3DRMMeshBuilder3.
---
dlls/d3drm/meshbuilder.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 62c3149..409e659 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -772,15 +772,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetTextureCoordinates(IDirect3 { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface);
- FIXME("(%p)->(%d,%p,%p): stub\n", This, index, u, v); + TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v);
- if (index >= This->nb_coords2d) - return D3DRMERR_NOTFOUND; - - *u = This->pCoords2d[index].u; - *v = This->pCoords2d[index].v; - - return D3DRM_OK; + return IDirect3DRMMeshBuilder2_GetTextureCoordinates(&This->IDirect3DRMMeshBuilder3_iface, + index, u, v); }
static int WINAPI IDirect3DRMMeshBuilder2Impl_AddVertex(IDirect3DRMMeshBuilder2* iface, @@ -1579,9 +1574,15 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetTextureCoordinates(IDirect3 { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface);
- FIXME("(%p)->(%d,%p,%p): stub\n", This, index, u, v); + TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v);
- return E_NOTIMPL; + if (index >= This->nb_coords2d) + return D3DRMERR_NOTFOUND; + + *u = This->pCoords2d[index].u; + *v = This->pCoords2d[index].v; + + return D3DRM_OK; }