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

wined3d: Move location flag updating out of surface_init_sysmem.

This commit is contained in:
Stefan Dösinger 2014-01-10 12:40:45 +01:00 committed by Alexandre Julliard
parent c770d3f573
commit 18bf8b49b3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/wined3d/surface.c
View File

@ -1341,9 +1341,6 @@ static BOOL surface_init_sysmem(struct wined3d_surface *surface)
surface->resource.allocatedMemory = surface->resource.heap_memory; surface->resource.allocatedMemory = surface->resource.heap_memory;
} }
surface_validate_location(surface, SFLAG_INSYSMEM);
surface_invalidate_location(surface, ~SFLAG_INSYSMEM);
return TRUE; return TRUE;
} }
@ -1370,7 +1367,10 @@ static void surface_unload(struct wined3d_resource *resource)
* and all flags get lost * and all flags get lost
*/ */
if (!(surface->flags & SFLAG_PBO)) if (!(surface->flags & SFLAG_PBO))
{
surface_init_sysmem(surface); surface_init_sysmem(surface);
surface_validate_location(surface, SFLAG_INSYSMEM);
}
/* We also get here when the ddraw swapchain is destroyed, for example /* We also get here when the ddraw swapchain is destroyed, for example
* for a mode switch. In this case this surface won't necessarily be * for a mode switch. In this case this surface won't necessarily be
* an implicit surface. We have to mark it lost so that the * an implicit surface. We have to mark it lost so that the
@ -2784,11 +2784,12 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface,
return hr; return hr;
} }
surface->resource.allocatedMemory = surface->dib.bitmap_data; surface->resource.allocatedMemory = surface->dib.bitmap_data;
surface->flags |= SFLAG_INSYSMEM;
} }
else if (!surface_init_sysmem(surface)) else if (!surface_init_sysmem(surface))
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
surface_validate_location(surface, SFLAG_INSYSMEM);
return WINED3D_OK; return WINED3D_OK;
} }