Henri Verbeet : wined3d: Ignore WINED3D_MAP_DISCARD when used together with WINED3D_MAP_NOOVERWRITE.
Alexandre Julliard
julliard at winehq.org
Sun Mar 18 09:02:34 CDT 2018
Module: wine
Branch: oldstable
Commit: ab74b3c012bbf38675228e81fd6a245ac5152c9f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab74b3c012bbf38675228e81fd6a245ac5152c9f
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jan 3 16:06:55 2018 +0100
wined3d: Ignore WINED3D_MAP_DISCARD when used together with WINED3D_MAP_NOOVERWRITE.
This fixes a performance issue exposed by commit
afb2aa2512d4c5ffa7256ce5137bc2c142a5d065.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 63ed42ac39440cc914397c70ed0c43aa747ceb4e)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/wined3d/resource.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 611c61f..6534b94 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -328,17 +328,19 @@ static DWORD wined3d_resource_sanitise_map_flags(const struct wined3d_resource *
return 0;
}
}
- else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))
- == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))
+ else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))
{
- WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n");
- return 0;
- }
- else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)
- && !(resource->usage & WINED3DUSAGE_DYNAMIC))
- {
- WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n");
- return 0;
+ if (!(resource->usage & WINED3DUSAGE_DYNAMIC))
+ {
+ WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n");
+ return 0;
+ }
+ if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))
+ == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))
+ {
+ WARN("WINED3D_MAP_NOOVERWRITE used with WINED3D_MAP_DISCARD, ignoring WINED3D_MAP_DISCARD.\n");
+ flags &= ~WINED3D_MAP_DISCARD;
+ }
}
return flags;
More information about the wine-cvs
mailing list