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

wined3d: Set the surface location to SFLAG_INSYSMEM for depth stencils on Reset.

This commit is contained in:
H. Verbeet 2008-06-02 21:12:54 +02:00 committed by Alexandre Julliard
parent 3687207a04
commit 35bdc00479
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wined3d/device.c
View File

@ -7048,8 +7048,12 @@ static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAM
surface->resource.allocatedMemory = NULL; surface->resource.allocatedMemory = NULL;
surface->resource.heapMemory = NULL; surface->resource.heapMemory = NULL;
surface->resource.size = IWineD3DSurface_GetPitch((IWineD3DSurface *) surface) * surface->pow2Width; surface->resource.size = IWineD3DSurface_GetPitch((IWineD3DSurface *) surface) * surface->pow2Width;
/* INDRAWABLE is a sane place for implicit targets / depth stencil after the reset */ /* INDRAWABLE is a sane place for implicit targets after the reset, INSYSMEM is more appropriate for depth stencils. */
IWineD3DSurface_ModifyLocation((IWineD3DSurface *) surface, SFLAG_INDRAWABLE, TRUE); if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) {
IWineD3DSurface_ModifyLocation((IWineD3DSurface *) surface, SFLAG_INSYSMEM, TRUE);
} else {
IWineD3DSurface_ModifyLocation((IWineD3DSurface *) surface, SFLAG_INDRAWABLE, TRUE);
}
} }
static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *data) { static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *data) {

6
dlls/wined3d/surface.c
View File

@ -572,7 +572,11 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) {
* uninitialized drawable. That's pointless and we'd have to allocate the texture / * uninitialized drawable. That's pointless and we'd have to allocate the texture /
* sysmem copy here. * sysmem copy here.
*/ */
IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, TRUE); if (This->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) {
IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE);
} else {
IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, TRUE);
}
} else { } else {
/* Load the surface into system memory */ /* Load the surface into system memory */
IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL);