Henri Verbeet : wined3d: Get rid of the WINED3DTRIPATCH_INFO typedef.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2fb21e0a2e5cc7092370e8d13c8fe5840f1b8f7f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2fb21e0a2e5cc7092370e8d13c8fe5840f1b8f7f

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Nov 23 21:14:56 2011 +0100

wined3d: Get rid of the WINED3DTRIPATCH_INFO typedef.

---

 dlls/d3d8/device.c     |    2 +-
 dlls/d3d9/device.c     |    2 +-
 dlls/wined3d/device.c  |    2 +-
 include/wine/wined3d.h |   14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index f8c6f92..eb398ab 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2615,7 +2615,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DrawTriPatch(IDirect3DDevice8 *iface,
 
     wined3d_mutex_lock();
     hr = wined3d_device_draw_tri_patch(This->wined3d_device, Handle,
-            pNumSegs, (const WINED3DTRIPATCH_INFO *)pTriPatchInfo);
+            pNumSegs, (const struct wined3d_tri_patch_info *)pTriPatchInfo);
     wined3d_mutex_unlock();
 
     return hr;
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 3532b57..32215c5 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2701,7 +2701,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(IDirect3DDevice9Ex *ifac
 
     wined3d_mutex_lock();
     hr = wined3d_device_draw_tri_patch(This->wined3d_device, Handle,
-            pNumSegs, (const WINED3DTRIPATCH_INFO *)pTriPatchInfo);
+            pNumSegs, (const struct wined3d_tri_patch_info *)pTriPatchInfo);
     wined3d_mutex_unlock();
 
     return hr;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index dbefa63..3737abb 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4745,7 +4745,7 @@ HRESULT CDECL wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT
 }
 
 HRESULT CDECL wined3d_device_draw_tri_patch(struct wined3d_device *device, UINT handle,
-        const float *segment_count, const WINED3DTRIPATCH_INFO *patch_info)
+        const float *segment_count, const struct wined3d_tri_patch_info *patch_info)
 {
     FIXME("device %p, handle %#x, segment_count %p, patch_info %p stub!\n",
             device, handle, segment_count, patch_info);
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index b755b74..6585800 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1607,13 +1607,13 @@ struct wined3d_rect_patch_info
     WINED3DDEGREETYPE degree;
 };
 
-typedef struct _WINED3DTRIPATCH_INFO
+struct wined3d_tri_patch_info
 {
-    UINT StartVertexOffset;
-    UINT NumVertices;
-    WINED3DBASISTYPE Basis;
-    WINED3DDEGREETYPE Degree;
-} WINED3DTRIPATCH_INFO;
+    UINT start_vertex_offset;
+    UINT vertex_count;
+    WINED3DBASISTYPE basis;
+    WINED3DDEGREETYPE degree;
+};
 
 typedef struct _WINED3DADAPTER_IDENTIFIER
 {
@@ -2191,7 +2191,7 @@ HRESULT __cdecl wined3d_device_draw_primitive_up(struct wined3d_device *device,
 HRESULT __cdecl wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT handle,
         const float *num_segs, const struct wined3d_rect_patch_info *rect_patch_info);
 HRESULT __cdecl wined3d_device_draw_tri_patch(struct wined3d_device *device, UINT handle,
-        const float *num_segs, const WINED3DTRIPATCH_INFO *tri_patch_info);
+        const float *num_segs, const struct wined3d_tri_patch_info *tri_patch_info);
 HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device);
 HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock);
 void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device);