Module: wine Branch: master Commit: f7bf61ea4cb3ad693d587831770b75a4cb179957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bf61ea4cb3ad693d58783177...
Author: Riccardo Bortolato rikyz619@gmail.com Date: Tue Nov 3 11:45:26 2015 +0100
ddraw: Remove unused mipmap_level from ddraw_surface.
Signed-off-by: Riccardo Bortolato rikyz619@gmail.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ddraw/ddraw_private.h | 3 --- dlls/ddraw/surface.c | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index bb0a3f8..7c50031 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -185,9 +185,6 @@ struct ddraw_surface /* Surface description, for GetAttachedSurface */ DDSURFACEDESC2 surface_desc;
- /* Misc things */ - UINT mipmap_level; - /* Clipper objects */ struct ddraw_clipper *clipper; struct ddraw_palette *palette; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 692f129..8a10eff 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -777,7 +777,6 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa */
TRACE("(%p): Returning surface %p\n", This, surf); - TRACE("(%p): mipmapcount=%d\n", This, surf->mipmap_level); *Surface = &surf->IDirectDrawSurface7_iface; ddraw_surface7_AddRef(*Surface); wined3d_mutex_unlock(); @@ -5108,8 +5107,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu struct ddraw_palette *dst_pal, *src_pal; DDSURFACEDESC *src_desc, *dst_desc;
- TRACE("Copying surface %p to surface %p (mipmap level %d).\n", - src_surface, dst_surface, src_surface->mipmap_level); + TRACE("Copying surface %p to surface %p.\n", src_surface, dst_surface);
/* Suppress the ALLOCONLOAD flag */ dst_surface->surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD;