system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-04 08:37:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

ddraw: Make default pool resources dynamic.

Browse source 
To make DDLOCK_DISCARDCONTENTS actually do anything. The MAPPABLE flag
is now redundant.
This commit is contained in:
Stefan Dösinger 2013-10-24 14:43:42 +02:00 committed by Alexandre Julliard
parent 331bb68edb
commit 9e0ba3eab0
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/ddraw/ddraw.c
View file

@ -2873,7 +2873,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD,
* the surface isn't mapped, and that updates done this way will be * the surface isn't mapped, and that updates done this way will be
* visible on the screen. The game Nox is such an application, * visible on the screen. The game Nox is such an application,
* Commandos: Behind Enemy Lines is another. */ * Commandos: Behind Enemy Lines is another. */
const DWORD flags = WINED3D_SURFACE_MAPPABLE | WINED3D_SURFACE_PIN_SYSMEM; const DWORD flags = WINED3D_SURFACE_PIN_SYSMEM;
TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p.\n", ddraw, DDSD, surface, UnkOuter); TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p.\n", ddraw, DDSD, surface, UnkOuter);

3
dlls/ddraw/surface.c
View file

@ -5623,7 +5623,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac
} }
else else
{ {
wined3d_desc.usage = WINED3DUSAGE_TEXTURE; wined3d_desc.usage = WINED3DUSAGE_TEXTURE | WINED3DUSAGE_DYNAMIC;
pool = WINED3D_POOL_DEFAULT; pool = WINED3D_POOL_DEFAULT;
} }
@ -5771,6 +5771,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw,
/* Videomemory adds localvidmem. This is mutually exclusive with /* Videomemory adds localvidmem. This is mutually exclusive with
* systemmemory and texturemanage. */ * systemmemory and texturemanage. */
desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM; desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM;
usage |= WINED3DUSAGE_DYNAMIC;
} }
format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat); format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat);