Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
9e0ba3ea
Commit
9e0ba3ea
authored
Oct 24, 2013
by
Stefan Dösinger
Committed by
Alexandre Julliard
Oct 24, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Make default pool resources dynamic.
To make DDLOCK_DISCARDCONTENTS actually do anything. The MAPPABLE flag is now redundant.
parent
331bb68e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
ddraw.c
dlls/ddraw/ddraw.c
+1
-1
surface.c
dlls/ddraw/surface.c
+2
-1
No files found.
dlls/ddraw/ddraw.c
View file @
9e0ba3ea
...
@@ -2873,7 +2873,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD,
...
@@ -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
);
...
...
dlls/ddraw/surface.c
View file @
9e0ba3ea
...
@@ -5623,7 +5623,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac
...
@@ -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,
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment