Module: wine Branch: master Commit: 45f6def784051f5a1e0db3d1c86fb93a076da007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f6def784051f5a1e0db3d1c8...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Jan 6 11:20:06 2012 +0100
wined3d: Get rid of the WINED3DBACKBUFFER_TYPE typedef.
---
dlls/d3d8/device.c | 2 +- dlls/d3d8/swapchain.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/d3d9/swapchain.c | 2 +- dlls/dxgi/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/swapchain.c | 2 +- include/wine/wined3d.h | 15 +++++++-------- 9 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3fcc6b3..ea75723 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -627,7 +627,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(IDirect3DDevice8 *iface
wined3d_mutex_lock(); 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) { *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 02b39f1..5ed5c60 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -117,7 +117,7 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(IDirect3DSwapChain8
wined3d_mutex_lock(); 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) { *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 684ae4d..38bab06 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -620,7 +620,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(IDirect3DDevice9Ex *ifa
wined3d_mutex_lock(); 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) { *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 928bb89..7ad0021 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -126,7 +126,7 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetBackBuffer(IDirect3DSwapChain9
wined3d_mutex_lock(); 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) { *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f0ccf32..3f35af6 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -159,7 +159,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, EnterCriticalSection(&dxgi_cs);
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)) { LeaveCriticalSection(&dxgi_cs); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 00670e5..11e1d5e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -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, - 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; HRESULT hr; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d48464c..a77e716 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1304,7 +1304,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) hr = wined3d_device_get_swapchain(device, 0, &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) { struct wined3d_resource_desc desc; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c64c5ef..865b1ba 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -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, - 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", swapchain, back_buffer_idx, type, back_buffer); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6cc8a05..08c1c17 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -494,13 +494,12 @@ enum wined3d_patch_edge_style WINED3D_PATCH_EDGE_CONTINUOUS = 1, };
-typedef enum _WINED3DBACKBUFFER_TYPE +enum wined3d_backbuffer_type { - WINED3DBACKBUFFER_TYPE_MONO = 0, - WINED3DBACKBUFFER_TYPE_LEFT = 1, - WINED3DBACKBUFFER_TYPE_RIGHT = 2, - WINED3DBACKBUFFER_TYPE_FORCE_DWORD = 0x7fffffff -} WINED3DBACKBUFFER_TYPE; + WINED3D_BACKBUFFER_TYPE_MONO = 0, + WINED3D_BACKBUFFER_TYPE_LEFT = 1, + WINED3D_BACKBUFFER_TYPE_RIGHT = 2, +};
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); 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, - 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); 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, @@ -2353,7 +2352,7 @@ HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, const struct wined3d_parent_ops *parent_ops, 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, - 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); HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, struct wined3d_display_mode *mode);
-
Alexandre Julliard