Module: wine Branch: master Commit: 05b84945d5b1b2d37b20ae390db557b70d3395ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b84945d5b1b2d37b20ae390d...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Mon Feb 15 18:18:00 2016 +0100
wined3d: Get rid of the unused _WINEDDOVERLAYFX structure.
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ddraw/surface.c | 7 +++++-- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 26 +------------------------- 4 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index aa6a0d1..dc6ad25 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3707,14 +3707,17 @@ static HRESULT WINAPI ddraw_surface7_UpdateOverlay(IDirectDrawSurface7 *iface, R TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_rect(dst_rect), flags, fx);
+ if (fx) + FIXME("Ignoring fx %p.\n", fx); + wined3d_mutex_lock(); if (dst_impl) { dst_wined3d_texture = dst_impl->wined3d_texture; dst_sub_resource_idx = dst_impl->sub_resource_idx; } - hr = wined3d_texture_update_overlay(src_impl->wined3d_texture, src_impl->sub_resource_idx, src_rect, - dst_wined3d_texture, dst_sub_resource_idx, dst_rect, flags, (WINEDDOVERLAYFX *)fx); + hr = wined3d_texture_update_overlay(src_impl->wined3d_texture, src_impl->sub_resource_idx, + src_rect, dst_wined3d_texture, dst_sub_resource_idx, dst_rect, flags); wined3d_mutex_unlock();
switch (hr) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b4c8bb2..1b144e3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1432,15 +1432,15 @@ HRESULT CDECL wined3d_texture_set_overlay_position(struct wined3d_texture *textu
HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, unsigned int sub_resource_idx, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, - const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx) + const RECT *dst_rect, DWORD flags) { struct wined3d_resource *sub_resource, *dst_sub_resource; struct wined3d_surface *surface, *dst_surface;
TRACE("texture %p, sub_resource_idx %u, src_rect %s, dst_texture %p, " - "dst_sub_resource_idx %u, dst_rect %s, flags %#x, fx %p.\n", + "dst_sub_resource_idx %u, dst_rect %s, flags %#x.\n", texture, sub_resource_idx, wine_dbgstr_rect(src_rect), dst_texture, - dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), flags, fx); + dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), flags);
if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D || !(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bbd2fb5..47eea42 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,7 +259,7 @@ @ cdecl wined3d_texture_set_lod(ptr long) @ cdecl wined3d_texture_set_overlay_position(ptr long long long) @ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) -@ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long ptr) +@ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long)
@ cdecl wined3d_vertex_declaration_create(ptr ptr long ptr ptr ptr) @ cdecl wined3d_vertex_declaration_create_from_fvf(ptr long ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d5cae29..3b5e0d6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1901,30 +1901,6 @@ typedef struct _WINEDDBLTFX struct wined3d_color_key ddckSrcColorkey; /* SrcColorkey override */ } WINEDDBLTFX,*LPWINEDDBLTFX;
-typedef struct _WINEDDOVERLAYFX -{ - DWORD dwSize; /* size of structure */ - DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */ - DWORD dwAlphaEdgeBlend; /* Constant to use as alpha for edge blend */ - DWORD dwReserved; - DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */ - union - { - DWORD dwAlphaDestConst; /* Constant to use as alpha channel for dest */ - struct wined3d_surface *lpDDSAlphaDest; /* Surface to use as alpha channel for dest */ - } DUMMYUNIONNAME1; - DWORD dwAlphaSrcConstBitDepth; /* Bit depth used to specify alpha constant for source */ - union - { - DWORD dwAlphaSrcConst; /* Constant to use as alpha channel for src */ - struct wined3d_surface *lpDDSAlphaSrc; /* Surface to use as alpha channel for src */ - } DUMMYUNIONNAME2; - struct wined3d_color_key dckDestColorkey; /* DestColorkey override */ - struct wined3d_color_key dckSrcColorkey; /* SrcColorkey override */ - DWORD dwDDFX; /* Overlay FX */ - DWORD dwFlags; /* flags */ -} WINEDDOVERLAYFX; - struct wined3d_buffer_desc { UINT byte_width; @@ -2545,7 +2521,7 @@ HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, void *mem, UINT pitch); HRESULT __cdecl wined3d_texture_update_overlay(struct wined3d_texture *texture, unsigned int sub_resource_idx, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, - const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx); + const RECT *dst_rect, DWORD flags);
HRESULT __cdecl wined3d_vertex_declaration_create(struct wined3d_device *device, const struct wined3d_vertex_element *elements, UINT element_count, void *parent,