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

ddraw: Remove unused mipmap_level from ddraw_surface.

Browse Source 
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Riccardo Bortolato 2015-11-03 11:45:26 +01:00 committed by Alexandre Julliard
parent 825c675ebe
commit f7bf61ea4c
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ddraw/ddraw_private.h
View File

@ -185,9 +185,6 @@ struct ddraw_surface
/* Surface description, for GetAttachedSurface */ /* Surface description, for GetAttachedSurface */
DDSURFACEDESC2 surface_desc; DDSURFACEDESC2 surface_desc;
/* Misc things */
UINT mipmap_level;
/* Clipper objects */ /* Clipper objects */
struct ddraw_clipper *clipper; struct ddraw_clipper *clipper;
struct ddraw_palette *palette; struct ddraw_palette *palette;

4
dlls/ddraw/surface.c
View File

@ -777,7 +777,6 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa
*/ */
TRACE("(%p): Returning surface %p\n", This, surf); TRACE("(%p): Returning surface %p\n", This, surf);
TRACE("(%p): mipmapcount=%d\n", This, surf->mipmap_level);
*Surface = &surf->IDirectDrawSurface7_iface; *Surface = &surf->IDirectDrawSurface7_iface;
ddraw_surface7_AddRef(*Surface); ddraw_surface7_AddRef(*Surface);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
@ -5108,8 +5107,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
struct ddraw_palette *dst_pal, *src_pal; struct ddraw_palette *dst_pal, *src_pal;
DDSURFACEDESC *src_desc, *dst_desc; DDSURFACEDESC *src_desc, *dst_desc;
TRACE("Copying surface %p to surface %p (mipmap level %d).\n", TRACE("Copying surface %p to surface %p.\n", src_surface, dst_surface);
src_surface, dst_surface, src_surface->mipmap_level);
/* Suppress the ALLOCONLOAD flag */ /* Suppress the ALLOCONLOAD flag */
dst_surface->surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD; dst_surface->surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD;