Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
2420d37a
Commit
2420d37a
authored
Feb 02, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Feb 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use the resource access flags in wined3d_texture_unload().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e6909c8f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
texture.c
dlls/wined3d/texture.c
+6
-4
No files found.
dlls/wined3d/texture.c
View file @
2420d37a
...
...
@@ -1803,7 +1803,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource)
{
struct
wined3d_texture_sub_resource
*
sub_resource
=
&
texture
->
sub_resources
[
i
];
if
(
resource
->
pool
!=
WINED3D_POOL_DEFAULT
if
(
resource
->
access
&
WINED3D_RESOURCE_ACCESS_CPU
&&
wined3d_texture_load_location
(
texture
,
i
,
context
,
resource
->
map_binding
))
{
wined3d_texture_invalidate_location
(
texture
,
i
,
~
resource
->
map_binding
);
...
...
@@ -1812,9 +1812,11 @@ static void wined3d_texture_unload(struct wined3d_resource *resource)
{
/* We should only get here on device reset/teardown for implicit
* resources. */
if
(
resource
->
pool
!=
WINED3D_POOL_DEFAULT
||
resource
->
type
!=
WINED3D_RTYPE_TEXTURE_2D
)
ERR
(
"Discarding %s %p sub-resource %u in the %s pool.
\n
"
,
debug_d3dresourcetype
(
resource
->
type
),
resource
,
i
,
debug_d3dpool
(
resource
->
pool
));
if
(
resource
->
access
&
WINED3D_RESOURCE_ACCESS_CPU
||
resource
->
type
!=
WINED3D_RTYPE_TEXTURE_2D
)
ERR
(
"Discarding %s %p sub-resource %u with resource access %s.
\n
"
,
debug_d3dresourcetype
(
resource
->
type
),
resource
,
i
,
wined3d_debug_resource_access
(
resource
->
access
));
wined3d_texture_validate_location
(
texture
,
i
,
WINED3D_LOCATION_DISCARDED
);
wined3d_texture_invalidate_location
(
texture
,
i
,
~
WINED3D_LOCATION_DISCARDED
);
}
...
...
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