Henri Verbeet : wined3d: Use the resource access flags in wined3d_texture_unload().
Alexandre Julliard
julliard at winehq.org
Fri Feb 2 12:24:39 CST 2018
Module: wine
Branch: master
Commit: 2420d37a9dea52c7605c2343f272995bc5d7f792
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2420d37a9dea52c7605c2343f272995bc5d7f792
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Feb 2 20:46:51 2018 +0330
wined3d: Use the resource access flags in wined3d_texture_unload().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/texture.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 03cf027..5007696 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -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);
}
More information about the wine-cvs
mailing list