From 360c1114d6bd829d786a6a8548a0a7a9725e3ef2 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 2 Dec 2011 08:15:53 +0100 Subject: [PATCH] wined3d: Get rid of the WINED3DRASTER_STATUS typedef. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 3 ++- dlls/d3d9/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 2 +- include/wine/wined3d.h | 12 ++++++------ 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 88a5c4b667a..923046ddc87 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -648,7 +648,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRasterStatus(IDirect3DDevice8 *ifa TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus); wined3d_mutex_lock(); - hr = wined3d_device_get_raster_status(This->wined3d_device, 0, (WINED3DRASTER_STATUS *)pRasterStatus); + hr = wined3d_device_get_raster_status(This->wined3d_device, 0, (struct wined3d_raster_status *)pRasterStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f4686e35548..684ae4dc914 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -640,7 +640,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRasterStatus(IDirect3DDevice9Ex *i TRACE("iface %p, swapchain %u, raster_status %p.\n", iface, iSwapChain, pRasterStatus); wined3d_mutex_lock(); - hr = wined3d_device_get_raster_status(This->wined3d_device, iSwapChain, (WINED3DRASTER_STATUS *)pRasterStatus); + hr = wined3d_device_get_raster_status(This->wined3d_device, + iSwapChain, (struct wined3d_raster_status *)pRasterStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index be0c244a622..928bb890c62 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -146,7 +146,7 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetRasterStatus(LPDIRECT3DSWAPCHAI TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus); wined3d_mutex_lock(); - hr = wined3d_swapchain_get_raster_status(This->wined3d_swapchain, (WINED3DRASTER_STATUS *)pRasterStatus); + hr = wined3d_swapchain_get_raster_status(This->wined3d_swapchain, (struct wined3d_raster_status *)pRasterStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 36b1208f8ac..1226390447f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4572,7 +4572,7 @@ BOOL CDECL wined3d_device_get_software_vertex_processing(const struct wined3d_de } HRESULT CDECL wined3d_device_get_raster_status(const struct wined3d_device *device, - UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status) + UINT swapchain_idx, struct wined3d_raster_status *raster_status) { struct wined3d_swapchain *swapchain; HRESULT hr; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1ea785837a8..398861909dc 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -203,7 +203,7 @@ HRESULT CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain * } HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, - WINED3DRASTER_STATUS *raster_status) + struct wined3d_raster_status *raster_status) { static BOOL warned; /* No OpenGL equivalent */ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 34abce9f910..1a0d17041ea 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1696,11 +1696,11 @@ struct wined3d_device_creation_parameters DWORD flags; }; -typedef struct _WINED3DRASTER_STATUS +struct wined3d_raster_status { - BOOL InVBlank; - UINT ScanLine; -} WINED3DRASTER_STATUS; + BOOL in_vblank; + UINT scan_line; +}; typedef struct _WINED3DDEVINFO_VERTEXSTATS { @@ -2177,7 +2177,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *devi HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, - UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status); + UINT swapchain_idx, struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, WINED3DRENDERSTATETYPE state, DWORD *value); HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *device, @@ -2411,7 +2411,7 @@ void * __cdecl wined3d_swapchain_get_parent(const struct wined3d_swapchain *swap HRESULT __cdecl wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, struct wined3d_swapchain_desc *desc); HRESULT __cdecl wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, - WINED3DRASTER_STATUS *raster_status); + struct wined3d_raster_status *raster_status); ULONG __cdecl wined3d_swapchain_incref(struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, -- 2.11.4.GIT