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
7772c4fd
Commit
7772c4fd
authored
Feb 14, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Feb 14, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Enforce map access on all resources.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ce50a7ff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
resource.c
dlls/wined3d/resource.c
+6
-0
texture.c
dlls/wined3d/texture.c
+0
-6
No files found.
dlls/wined3d/resource.c
View file @
7772c4fd
...
...
@@ -346,6 +346,12 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i
TRACE
(
"resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.
\n
"
,
resource
,
sub_resource_idx
,
map_desc
,
debug_box
(
box
),
flags
);
if
(
!
(
resource
->
access
&
WINED3D_RESOURCE_ACCESS_MAP
))
{
WARN
(
"Resource is not mappable.
\n
"
);
return
WINED3DERR_INVALIDCALL
;
}
flags
=
wined3d_resource_sanitise_map_flags
(
resource
,
flags
);
wined3d_resource_wait_idle
(
resource
);
...
...
dlls/wined3d/texture.c
View file @
7772c4fd
...
...
@@ -1897,12 +1897,6 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
return
WINED3DERR_INVALIDCALL
;
}
if
(
!
(
resource
->
access
&
WINED3D_RESOURCE_ACCESS_MAP
))
{
WARN
(
"Trying to map unmappable texture.
\n
"
);
return
WINED3DERR_INVALIDCALL
;
}
if
(
texture
->
flags
&
WINED3D_TEXTURE_DC_IN_USE
)
{
WARN
(
"DC is in use.
\n
"
);
...
...
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