ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Get rid of the WINED3DRASTER_STATUS typedef.

This commit is contained in:
Henri Verbeet 2011-12-02 08:15:53 +01:00 committed by Alexandre Julliard
parent 94c9b0b4fc
commit 360c1114d6
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d8/device.c
View File

@ -648,7 +648,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRasterStatus(IDirect3DDevice8 *ifa
TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus); TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus);
wined3d_mutex_lock(); 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(); wined3d_mutex_unlock();
return hr; return hr;

3
dlls/d3d9/device.c
View File

@ -640,7 +640,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRasterStatus(IDirect3DDevice9Ex *i
TRACE("iface %p, swapchain %u, raster_status %p.\n", iface, iSwapChain, pRasterStatus); TRACE("iface %p, swapchain %u, raster_status %p.\n", iface, iSwapChain, pRasterStatus);
wined3d_mutex_lock(); 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(); wined3d_mutex_unlock();
return hr; return hr;

2
dlls/d3d9/swapchain.c
View File

@ -146,7 +146,7 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetRasterStatus(LPDIRECT3DSWAPCHAI
TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus); TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus);
wined3d_mutex_lock(); 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(); wined3d_mutex_unlock();
return hr; return hr;

2
dlls/wined3d/device.c
View File

@ -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, 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; struct wined3d_swapchain *swapchain;
HRESULT hr; HRESULT hr;

2
dlls/wined3d/swapchain.c
View File

@ -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, 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; static BOOL warned;
/* No OpenGL equivalent */ /* No OpenGL equivalent */

12
include/wine/wined3d.h
View File

@ -1696,11 +1696,11 @@ struct wined3d_device_creation_parameters
DWORD flags; DWORD flags;
}; };
typedef struct _WINED3DRASTER_STATUS struct wined3d_raster_status
{ {
BOOL InVBlank; BOOL in_vblank;
UINT ScanLine; UINT scan_line;
} WINED3DRASTER_STATUS; };
typedef struct _WINED3DDEVINFO_VERTEXSTATS 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, HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device,
UINT start_register, int *constants, UINT vector4i_count); UINT start_register, int *constants, UINT vector4i_count);
HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, 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, HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *device,
WINED3DRENDERSTATETYPE state, DWORD *value); WINED3DRENDERSTATETYPE state, DWORD *value);
HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *device, 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, HRESULT __cdecl wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain,
struct wined3d_swapchain_desc *desc); struct wined3d_swapchain_desc *desc);
HRESULT __cdecl wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, 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); ULONG __cdecl wined3d_swapchain_incref(struct wined3d_swapchain *swapchain);
HRESULT __cdecl wined3d_swapchain_present(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, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override,