Stefan Dösinger : wined3d: Add WINED3DTRIPATCH_INFO to wined3d_types.h.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 0f7eb52789a9265a2700c3f1f7cacc1056835f3f
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=0f7eb52789a9265a2700c3f1f7cacc1056835f3f

Author: Stefan Dösinger <stefandoesinger at gmx.at>
Date:   Fri Mar 24 16:06:28 2006 +0100

wined3d: Add WINED3DTRIPATCH_INFO to wined3d_types.h.

---

 dlls/d3d8/device.c               |    2 +-
 dlls/d3d9/device.c               |    2 +-
 dlls/wined3d/device.c            |    2 +-
 include/wine/wined3d_interface.h |    2 +-
 include/wine/wined3d_types.h     |    8 ++++++++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 525ded9..0d668b9 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -1325,7 +1325,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Draw
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     TRACE("(%p) Relay\n", This);
 
-    return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, pTriPatchInfo);
+    return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DTRIPATCH_INFO *)pTriPatchInfo);
 }
 
 HRESULT WINAPI IDirect3DDevice8Impl_DeletePatch(LPDIRECT3DDEVICE8 iface, UINT Handle) {
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index c61bf15..a134d59 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -802,7 +802,7 @@ HRESULT  WINAPI  IDirect3DDevice9Impl_Dr
 HRESULT  WINAPI  IDirect3DDevice9Impl_DrawTriPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) {
     IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
     TRACE("(%p) Relay\n", This);
-    return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, pTriPatchInfo);
+    return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DTRIPATCH_INFO *) pTriPatchInfo);
 }
 
 HRESULT  WINAPI  IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9 iface, UINT Handle) {
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 1a55b8e..b0ea82b 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5819,7 +5819,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_DrawRe
 }
 
 /* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/d3d/interfaces/idirect3ddevice9/DrawTriPatch.asp */
-HRESULT WINAPI IWineD3DDeviceImpl_DrawTriPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) {
+HRESULT WINAPI IWineD3DDeviceImpl_DrawTriPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) {
     IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
     TRACE("(%p) Handle(%d) noSegs(%p) tripatch(%p)\n", This, Handle, pNumSegs, pTriPatchInfo);
     FIXME("(%p) : Stub\n", This);
diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h
index 255ecea..c4494f6 100644
--- a/include/wine/wined3d_interface.h
+++ b/include/wine/wined3d_interface.h
@@ -416,7 +416,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD
     STDMETHOD(DrawPrimitiveUP)(THIS_ D3DPRIMITIVETYPE  PrimitiveType,UINT  PrimitiveCount,CONST void * pVertexStreamZeroData,UINT  VertexStreamZeroStride) PURE;
     STDMETHOD(DrawIndexedPrimitiveUP)(THIS_ D3DPRIMITIVETYPE  PrimitiveType,UINT  MinVertexIndex,UINT  NumVertexIndices,UINT  PrimitiveCount,CONST void * pIndexData,WINED3DFORMAT  IndexDataFormat,CONST void * pVertexStreamZeroData,UINT  VertexStreamZeroStride) PURE;
     STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) PURE;
-    STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) PURE;
+    STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) PURE;
     STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE;
     STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST D3DRECT* pRect, D3DCOLOR color) PURE;
     STDMETHOD(UpdateTexture)(THIS_ struct IWineD3DBaseTexture *pSourceTexture, struct IWineD3DBaseTexture *pDestinationTexture) PURE;
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index 3c76715..e26ac21 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -5,6 +5,7 @@
  * Copyright 2002-2003 Jason Edmeades
  *                     Raphael Junqueira
  * Copyright 2005 Oliver Stieber
+ * Copyright 2006 Stefan Dösinger
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -428,6 +429,13 @@ typedef struct _WINEDD3DRECTPATCH_INFO {
     WINED3DDEGREETYPE   Degree;
 } WINED3DRECTPATCH_INFO;
 
+typedef struct _WINED3DTRIPATCH_INFO {
+    UINT                StartVertexOffset;
+    UINT                NumVertices;
+    WINED3DBASISTYPE    Basis;
+    WINED3DDEGREETYPE   Degree;
+} WINED3DTRIPATCH_INFO;
+
 
 typedef struct _WINED3DADAPTER_IDENTIFIER {
     char           *Driver;