wined3d: Get rid of the WineDirect3DVertexStridedData typedef.

dlls/wined3d/device.c

@@ -353,7 +353,7 @@ static void stream_info_element_from_strided(const struct wined3d_gl_info *gl_in
 }
 
 static void device_stream_info_from_strided(const struct wined3d_gl_info *gl_info,
-        const struct WineDirect3DVertexStridedData *strided, struct wined3d_stream_info *stream_info)
+        const struct wined3d_strided_data *strided, struct wined3d_stream_info *stream_info)
 {
     unsigned int i;
 
@@ -370,8 +370,8 @@ static void device_stream_info_from_strided(const struct wined3d_gl_info *gl_inf
 
     for (i = 0; i < WINED3DDP_MAXTEXCOORD; ++i)
     {
-        if (strided->texCoords[i].data)
-            stream_info_element_from_strided(gl_info, &strided->texCoords[i],
+        if (strided->tex_coords[i].data)
+            stream_info_element_from_strided(gl_info, &strided->tex_coords[i],
                     &stream_info->elements[WINED3D_FFP_TEXCOORD0 + i]);
     }
 
@@ -4249,7 +4249,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive_up(struct wined3d_device *de
 }
 
 HRESULT CDECL wined3d_device_draw_primitive_strided(struct wined3d_device *device,
-        UINT vertex_count, const WineDirect3DVertexStridedData *strided_data)
+        UINT vertex_count, const struct wined3d_strided_data *strided_data)
 {
     /* Mark the state dirty until we have nicer tracking. It's fine to change
      * baseVertexIndex because that call is only called by ddraw which does
@@ -4274,7 +4274,7 @@ HRESULT CDECL wined3d_device_draw_primitive_strided(struct wined3d_device *devic
 }
 
 HRESULT CDECL wined3d_device_draw_indexed_primitive_strided(struct wined3d_device *device,
-        UINT index_count, const WineDirect3DVertexStridedData *strided_data,
+        UINT index_count, const struct wined3d_strided_data *strided_data,
         UINT vertex_count, const void *index_data, enum wined3d_format_id index_data_format_id)
 {
     UINT index_size = index_data_format_id == WINED3DFMT_R32_UINT ? 4 : 2;

dlls/wined3d/drawprim.c

@@ -1136,11 +1136,11 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch
     }
     if (patch->has_texcoords)
     {
-        patch->strided.texCoords[0].format = WINED3DFMT_R32G32B32A32_FLOAT;
-        patch->strided.texCoords[0].data = (BYTE *)patch->mem + 3 * sizeof(float) /* pos */;
+        patch->strided.tex_coords[0].format = WINED3DFMT_R32G32B32A32_FLOAT;
+        patch->strided.tex_coords[0].data = (BYTE *)patch->mem + 3 * sizeof(float) /* pos */;
         if (patch->has_normals)
-            patch->strided.texCoords[0].data += 3 * sizeof(float);
-        patch->strided.texCoords[0].stride = vtxStride;
+            patch->strided.tex_coords[0].data += 3 * sizeof(float);
+        patch->strided.tex_coords[0].stride = vtxStride;
     }
 
     return WINED3D_OK;

dlls/wined3d/wined3d_private.h

@@ -1555,7 +1555,7 @@ struct WineD3DRectPatch
 {
     UINT                            Handle;
     float                          *mem;
-    WineDirect3DVertexStridedData   strided;
+    struct wined3d_strided_data strided;
     struct wined3d_rect_patch_info rect_patch_info;
     float                           numSegs[4];
     char                            has_normals, has_texcoords;
@@ -1746,7 +1746,7 @@ struct wined3d_device
 
     /* Stream source management */
     struct wined3d_stream_info strided_streams;
-    const WineDirect3DVertexStridedData *up_strided;
+    const struct wined3d_strided_data *up_strided;
     struct wined3d_event_query *buffer_queries[MAX_ATTRIBS];
     unsigned int num_buffer_queries;
 

include/wine/wined3d.h

@@ -1732,15 +1732,15 @@ struct wined3d_strided_element
     UINT stride;                    /* Stride between occurrences of this data */
 };
 
-typedef struct WineDirect3DVertexStridedData
+struct wined3d_strided_data
 {
     struct wined3d_strided_element position;
     struct wined3d_strided_element normal;
     struct wined3d_strided_element diffuse;
     struct wined3d_strided_element specular;
-    struct wined3d_strided_element texCoords[WINED3DDP_MAXTEXCOORD];
+    struct wined3d_strided_element tex_coords[WINED3DDP_MAXTEXCOORD];
     BOOL position_transformed;
-} WineDirect3DVertexStridedData;
+};
 
 typedef struct _WINED3DVSHADERCAPS2_0
 {
@@ -2109,14 +2109,14 @@ ULONG __cdecl wined3d_device_decref(struct wined3d_device *device);
 HRESULT __cdecl wined3d_device_delete_patch(struct wined3d_device *device, UINT handle);
 HRESULT __cdecl wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count);
 HRESULT __cdecl wined3d_device_draw_indexed_primitive_strided(struct wined3d_device *device, UINT index_count,
-        const WineDirect3DVertexStridedData *strided_data, UINT vertex_count, const void *index_data,
+        const struct wined3d_strided_data *strided_data, UINT vertex_count, const void *index_data,
         enum wined3d_format_id index_data_format_id);
 HRESULT __cdecl wined3d_device_draw_indexed_primitive_up(struct wined3d_device *device,
         UINT index_count, const void *index_data, enum wined3d_format_id index_data_format_id,
         const void *stream_data, UINT stream_stride);
 HRESULT __cdecl wined3d_device_draw_primitive(struct wined3d_device *device, UINT start_vertex, UINT vertex_count);
 HRESULT __cdecl wined3d_device_draw_primitive_strided(struct wined3d_device *device,
-        UINT vertex_count, const WineDirect3DVertexStridedData *strided_data);
+        UINT vertex_count, const struct wined3d_strided_data *strided_data);
 HRESULT __cdecl wined3d_device_draw_primitive_up(struct wined3d_device *device,
         UINT vertex_count, const void *stream_data, UINT stream_stride);
 HRESULT __cdecl wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT handle,