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

wined3d: Get rid of the WINED3DBACKBUFFER_TYPE typedef.

This commit is contained in:
Henri Verbeet 2012-01-06 11:20:06 +01:00 committed by Alexandre Julliard
parent 31f3120815
commit 45f6def784
9 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d8/device.c
View File

@ -627,7 +627,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(IDirect3DDevice8 *iface
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_device_get_back_buffer(This->wined3d_device, 0, hr = wined3d_device_get_back_buffer(This->wined3d_device, 0,
BackBuffer, (WINED3DBACKBUFFER_TYPE)Type, &wined3d_surface); BackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface);
if (SUCCEEDED(hr) && wined3d_surface && ppBackBuffer) if (SUCCEEDED(hr) && wined3d_surface && ppBackBuffer)
{ {
*ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface);

2
dlls/d3d8/swapchain.c
View File

@ -117,7 +117,7 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(IDirect3DSwapChain8
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, hr = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain,
iBackBuffer, (WINED3DBACKBUFFER_TYPE)Type, &wined3d_surface); iBackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface);
if (SUCCEEDED(hr) && wined3d_surface) if (SUCCEEDED(hr) && wined3d_surface)
{ {
*ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface);

2
dlls/d3d9/device.c
View File

@ -620,7 +620,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(IDirect3DDevice9Ex *ifa
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_device_get_back_buffer(This->wined3d_device, iSwapChain, hr = wined3d_device_get_back_buffer(This->wined3d_device, iSwapChain,
BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, &wined3d_surface); BackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface);
if (SUCCEEDED(hr) && wined3d_surface && ppBackBuffer) if (SUCCEEDED(hr) && wined3d_surface && ppBackBuffer)
{ {
*ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface);

2
dlls/d3d9/swapchain.c
View File

@ -126,7 +126,7 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetBackBuffer(IDirect3DSwapChain9
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, hr = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain,
iBackBuffer, (WINED3DBACKBUFFER_TYPE)Type, &wined3d_surface); iBackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface);
if (SUCCEEDED(hr) && wined3d_surface) if (SUCCEEDED(hr) && wined3d_surface)
{ {
*ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface);

2
dlls/dxgi/swapchain.c
View File

@ -159,7 +159,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface,
EnterCriticalSection(&dxgi_cs); EnterCriticalSection(&dxgi_cs);
hr = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, hr = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain,
buffer_idx, WINED3DBACKBUFFER_TYPE_MONO, &backbuffer); buffer_idx, WINED3D_BACKBUFFER_TYPE_MONO, &backbuffer);
if (FAILED(hr)) if (FAILED(hr))
{ {
LeaveCriticalSection(&dxgi_cs); LeaveCriticalSection(&dxgi_cs);

2
dlls/wined3d/device.c
View File

@ -3831,7 +3831,7 @@ HRESULT CDECL wined3d_device_get_texture(const struct wined3d_device *device,
} }
HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx, HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx,
UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer) UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer)
{ {
struct wined3d_swapchain *swapchain; struct wined3d_swapchain *swapchain;
HRESULT hr; HRESULT hr;

2
dlls/wined3d/stateblock.c
View File

@ -1304,7 +1304,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)
hr = wined3d_device_get_swapchain(device, 0, &swapchain); hr = wined3d_device_get_swapchain(device, 0, &swapchain);
if (SUCCEEDED(hr) && swapchain) if (SUCCEEDED(hr) && swapchain)
{ {
hr = wined3d_swapchain_get_back_buffer(swapchain, 0, WINED3DBACKBUFFER_TYPE_MONO, &backbuffer); hr = wined3d_swapchain_get_back_buffer(swapchain, 0, WINED3D_BACKBUFFER_TYPE_MONO, &backbuffer);
if (SUCCEEDED(hr) && backbuffer) if (SUCCEEDED(hr) && backbuffer)
{ {
struct wined3d_resource_desc desc; struct wined3d_resource_desc desc;

2
dlls/wined3d/swapchain.c
View File

@ -174,7 +174,7 @@ HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapc
} }
HRESULT CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, HRESULT CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain,
UINT back_buffer_idx, WINED3DBACKBUFFER_TYPE type, struct wined3d_surface **back_buffer) UINT back_buffer_idx, enum wined3d_backbuffer_type type, struct wined3d_surface **back_buffer)
{ {
TRACE("swapchain %p, back_buffer_idx %u, type %#x, back_buffer %p.\n", TRACE("swapchain %p, back_buffer_idx %u, type %#x, back_buffer %p.\n",
swapchain, back_buffer_idx, type, back_buffer); swapchain, back_buffer_idx, type, back_buffer);

15
include/wine/wined3d.h
View File

@ -494,13 +494,12 @@ enum wined3d_patch_edge_style
WINED3D_PATCH_EDGE_CONTINUOUS = 1, WINED3D_PATCH_EDGE_CONTINUOUS = 1,
}; };
typedef enum _WINED3DBACKBUFFER_TYPE enum wined3d_backbuffer_type
{ {
WINED3DBACKBUFFER_TYPE_MONO = 0, WINED3D_BACKBUFFER_TYPE_MONO = 0,
WINED3DBACKBUFFER_TYPE_LEFT = 1, WINED3D_BACKBUFFER_TYPE_LEFT = 1,
WINED3DBACKBUFFER_TYPE_RIGHT = 2, WINED3D_BACKBUFFER_TYPE_RIGHT = 2,
WINED3DBACKBUFFER_TYPE_FORCE_DWORD = 0x7fffffff };
} WINED3DBACKBUFFER_TYPE;
typedef enum _WINED3DSWAPEFFECT typedef enum _WINED3DSWAPEFFECT
{ {
@ -2099,7 +2098,7 @@ HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, str
void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device);
UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device);
HRESULT __cdecl wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx, HRESULT __cdecl wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx,
UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer);
INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device);
HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane);
HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device,
@ -2353,7 +2352,7 @@ HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device,
const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain);
ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain); ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain);
HRESULT __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, HRESULT __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain,
UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer);
struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3d_swapchain *swapchain); struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3d_swapchain *swapchain);
HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain,
struct wined3d_display_mode *mode); struct wined3d_display_mode *mode);