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

wined3d: Get rid of the WINED3DGAMMARAMP typedef.

Browse Source
This commit is contained in:
Henri Verbeet 2011-11-21 18:48:41 +01:00 committed by Alexandre Julliard
parent be8917cd91
commit 2e1c0d83c1
7 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/d3d8/device.c
View File

@ -661,9 +661,9 @@ static void WINAPI IDirect3DDevice8Impl_SetGammaRamp(IDirect3DDevice8 *iface, DW
TRACE("iface %p, flags %#x, ramp %p.\n", iface, Flags, pRamp); TRACE("iface %p, flags %#x, ramp %p.\n", iface, Flags, pRamp);
/* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_set_gamma_ramp(This->wined3d_device, 0, Flags, (const WINED3DGAMMARAMP *)pRamp); wined3d_device_set_gamma_ramp(This->wined3d_device, 0, Flags, (const struct wined3d_gamma_ramp *)pRamp);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
} }
@ -673,9 +673,9 @@ static void WINAPI IDirect3DDevice8Impl_GetGammaRamp(IDirect3DDevice8 *iface, D3
TRACE("iface %p, ramp %p.\n", iface, pRamp); TRACE("iface %p, ramp %p.\n", iface, pRamp);
/* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_get_gamma_ramp(This->wined3d_device, 0, (WINED3DGAMMARAMP *)pRamp); wined3d_device_get_gamma_ramp(This->wined3d_device, 0, (struct wined3d_gamma_ramp *)pRamp);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
} }

8
dlls/d3d9/device.c
View File

@ -668,9 +668,9 @@ static void WINAPI IDirect3DDevice9Impl_SetGammaRamp(IDirect3DDevice9Ex *iface,
TRACE("iface %p, swapchain %u, flags %#x, ramp %p.\n", iface, iSwapChain, Flags, pRamp); TRACE("iface %p, swapchain %u, flags %#x, ramp %p.\n", iface, iSwapChain, Flags, pRamp);
/* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_set_gamma_ramp(This->wined3d_device, iSwapChain, Flags, (const WINED3DGAMMARAMP *)pRamp); wined3d_device_set_gamma_ramp(This->wined3d_device, iSwapChain, Flags, (const struct wined3d_gamma_ramp *)pRamp);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
} }
@ -681,9 +681,9 @@ static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(IDirect3DDevice9Ex *iface,
TRACE("iface %p, swapchain %u, ramp %p.\n", iface, iSwapChain, pRamp); TRACE("iface %p, swapchain %u, ramp %p.\n", iface, iSwapChain, pRamp);
/* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ /* Note: D3DGAMMARAMP is compatible with struct wined3d_gamma_ramp. */
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_get_gamma_ramp(This->wined3d_device, iSwapChain, (WINED3DGAMMARAMP *)pRamp); wined3d_device_get_gamma_ramp(This->wined3d_device, iSwapChain, (struct wined3d_gamma_ramp *)pRamp);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
} }

9
dlls/ddraw/surface.c
View File

@ -4502,8 +4502,8 @@ static HRESULT WINAPI ddraw_gamma_control_GetGammaRamp(IDirectDrawGammaControl *
wined3d_mutex_lock(); wined3d_mutex_lock();
if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
{ {
/* Note: DDGAMMARAMP is compatible with WINED3DGAMMARAMP. */ /* Note: DDGAMMARAMP is compatible with struct wined3d_gamma_ramp. */
wined3d_device_get_gamma_ramp(surface->ddraw->wined3d_device, 0, (WINED3DGAMMARAMP *)gamma_ramp); wined3d_device_get_gamma_ramp(surface->ddraw->wined3d_device, 0, (struct wined3d_gamma_ramp *)gamma_ramp);
} }
else else
{ {
@ -4544,8 +4544,9 @@ static HRESULT WINAPI ddraw_gamma_control_SetGammaRamp(IDirectDrawGammaControl *
wined3d_mutex_lock(); wined3d_mutex_lock();
if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
{ {
/* Note: DDGAMMARAMP is compatible with WINED3DGAMMARAMP */ /* Note: DDGAMMARAMP is compatible with struct wined3d_gamma_ramp. */
wined3d_device_set_gamma_ramp(surface->ddraw->wined3d_device, 0, flags, (WINED3DGAMMARAMP *)gamma_ramp); wined3d_device_set_gamma_ramp(surface->ddraw->wined3d_device,
0, flags, (struct wined3d_gamma_ramp *)gamma_ramp);
} }
else else
{ {

4
dlls/wined3d/device.c
View File

@ -5713,7 +5713,7 @@ HRESULT CDECL wined3d_device_get_creation_parameters(const struct wined3d_device
} }
void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device,
UINT swapchain_idx, DWORD flags, const WINED3DGAMMARAMP *ramp) UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp)
{ {
struct wined3d_swapchain *swapchain; struct wined3d_swapchain *swapchain;
@ -5728,7 +5728,7 @@ void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device,
} }
void CDECL wined3d_device_get_gamma_ramp(const struct wined3d_device *device, void CDECL wined3d_device_get_gamma_ramp(const struct wined3d_device *device,
UINT swapchain_idx, WINED3DGAMMARAMP *ramp) UINT swapchain_idx, struct wined3d_gamma_ramp *ramp)
{ {
struct wined3d_swapchain *swapchain; struct wined3d_swapchain *swapchain;

4
dlls/wined3d/swapchain.c
View File

@ -254,7 +254,7 @@ HRESULT CDECL wined3d_swapchain_get_present_parameters(const struct wined3d_swap
} }
HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain,
DWORD flags, const WINED3DGAMMARAMP *ramp) DWORD flags, const struct wined3d_gamma_ramp *ramp)
{ {
HDC dc; HDC dc;
@ -271,7 +271,7 @@ HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *s
} }
HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain,
WINED3DGAMMARAMP *ramp) struct wined3d_gamma_ramp *ramp)
{ {
HDC dc; HDC dc;

2
dlls/wined3d/wined3d_private.h
View File

@ -2444,7 +2444,7 @@ struct wined3d_swapchain
WINED3DPRESENT_PARAMETERS presentParms; WINED3DPRESENT_PARAMETERS presentParms;
DWORD orig_width, orig_height; DWORD orig_width, orig_height;
enum wined3d_format_id orig_fmt; enum wined3d_format_id orig_fmt;
WINED3DGAMMARAMP orig_gamma; struct wined3d_gamma_ramp orig_gamma;
BOOL render_to_fbo; BOOL render_to_fbo;
const struct wined3d_format *ds_format; const struct wined3d_format *ds_format;

12
include/wine/wined3d.h
View File

@ -1583,12 +1583,12 @@ struct wined3d_viewport
float max_z; float max_z;
}; };
typedef struct _WINED3DGAMMARAMP struct wined3d_gamma_ramp
{ {
WORD red[256]; WORD red[256];
WORD green[256]; WORD green[256];
WORD blue[256]; WORD blue[256];
} WINED3DGAMMARAMP; };
typedef struct _WINED3DLINEPATTERN typedef struct _WINED3DLINEPATTERN
{ {
@ -2211,7 +2211,7 @@ HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *dev
HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device *device, HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device *device,
UINT swapchain_idx, struct wined3d_surface *dst_surface); UINT swapchain_idx, struct wined3d_surface *dst_surface);
void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device,
UINT swapchain_idx, WINED3DGAMMARAMP *ramp); UINT swapchain_idx, struct wined3d_gamma_ramp *ramp);
HRESULT __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, HRESULT __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device,
struct wined3d_buffer **index_buffer); struct wined3d_buffer **index_buffer);
HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device,
@ -2290,7 +2290,7 @@ HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device
HRESULT __cdecl wined3d_device_set_display_mode(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_display_mode(struct wined3d_device *device,
UINT swapchain_idx, const struct wined3d_display_mode *mode); UINT swapchain_idx, const struct wined3d_display_mode *mode);
void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device,
UINT swapchain_idx, DWORD flags, const WINED3DGAMMARAMP *ramp); UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp);
HRESULT __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device,
struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id);
HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device,
@ -2457,7 +2457,7 @@ HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchai
HRESULT __cdecl wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, HRESULT __cdecl wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain,
struct wined3d_surface *dst_surface); struct wined3d_surface *dst_surface);
HRESULT __cdecl wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, HRESULT __cdecl wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain,
WINED3DGAMMARAMP *ramp); struct wined3d_gamma_ramp *ramp);
void * __cdecl wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapchain); void * __cdecl wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapchain);
HRESULT __cdecl wined3d_swapchain_get_present_parameters(const struct wined3d_swapchain *swapchain, HRESULT __cdecl wined3d_swapchain_get_present_parameters(const struct wined3d_swapchain *swapchain,
WINED3DPRESENT_PARAMETERS *present_parameters); WINED3DPRESENT_PARAMETERS *present_parameters);
@ -2468,7 +2468,7 @@ 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,
const RGNDATA *dirty_region, DWORD flags); const RGNDATA *dirty_region, DWORD flags);
HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain,
DWORD flags, const WINED3DGAMMARAMP *ramp); DWORD flags, const struct wined3d_gamma_ramp *ramp);
HRESULT __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window);
HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture,