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

wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_init_sysmem().

This commit is contained in:
Henri Verbeet 2010-04-28 00:08:48 +02:00 committed by Alexandre Julliard
parent 5ac7b165e6
commit 23a377f02b
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/device.c
View File

@ -6234,7 +6234,7 @@ static HRESULT updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRES
/* Put all surfaces into sysmem - the drawable might disappear if the backbuffer was rendered
* to a FBO */
if(!surface_init_sysmem((IWineD3DSurface *) surface))
if (!surface_init_sysmem(surface))
{
return E_OUTOFMEMORY;
}

25
dlls/wined3d/surface.c
View File

@ -1141,27 +1141,26 @@ static void surface_remove_pbo(IWineD3DSurfaceImpl *This, const struct wined3d_g
This->Flags &= ~SFLAG_PBO;
}
BOOL surface_init_sysmem(IWineD3DSurface *iface)
BOOL surface_init_sysmem(IWineD3DSurfaceImpl *surface)
{
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
if(!This->resource.allocatedMemory)
if (!surface->resource.allocatedMemory)
{
This->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->resource.size + RESOURCE_ALIGNMENT);
if(!This->resource.heapMemory)
surface->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
surface->resource.size + RESOURCE_ALIGNMENT);
if (!surface->resource.heapMemory)
{
ERR("Out of memory\n");
return FALSE;
}
This->resource.allocatedMemory =
(BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1));
surface->resource.allocatedMemory =
(BYTE *)(((ULONG_PTR)surface->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1));
}
else
{
memset(This->resource.allocatedMemory, 0, This->resource.size);
memset(surface->resource.allocatedMemory, 0, surface->resource.size);
}
IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE);
IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, SFLAG_INSYSMEM, TRUE);
return TRUE;
}
@ -1186,8 +1185,10 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) {
* or the depth stencil into an FBO the texture or render buffer will be removed
* and all flags get lost
*/
surface_init_sysmem(iface);
} else {
surface_init_sysmem(This);
}
else
{
/* Load the surface into system memory */
IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL);
IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE);

2
dlls/wined3d/wined3d_private.h
View File

@ -1873,7 +1873,7 @@ typedef struct IWineD3DBaseTextureClass
} IWineD3DBaseTextureClass;
void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN;
BOOL surface_init_sysmem(IWineD3DSurface *iface) DECLSPEC_HIDDEN;
BOOL surface_init_sysmem(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN;
BOOL surface_is_offscreen(IWineD3DSurfaceImpl *iface) DECLSPEC_HIDDEN;
void surface_prepare_texture(IWineD3DSurfaceImpl *surface,
const struct wined3d_gl_info *gl_info, BOOL srgb) DECLSPEC_HIDDEN;