Henri Verbeet : wined3d: Use the previous "dirty" status to set WINED3D_BUFFER_NOSYNC in wined3d_buffer_map().
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jul 18 14:20:23 CDT 2014
Module: wine
Branch: master
Commit: 01251f3d3cb9c5f7b8cb006f91eb242f4f32bf4b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=01251f3d3cb9c5f7b8cb006f91eb242f4f32bf4b
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Jul 18 10:37:54 2014 +0200
wined3d: Use the previous "dirty" status to set WINED3D_BUFFER_NOSYNC in wined3d_buffer_map().
This (presumably) fixes a regression introduced by commit
c1032e977bb9f850e3aea28dd79e3d7c2244cd6c.
---
dlls/wined3d/buffer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index fa9ff92..d5dbc87 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -939,6 +939,7 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe
HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags)
{
+ BOOL dirty = buffer_is_dirty(buffer);
LONG count;
BYTE *base;
@@ -1034,7 +1035,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN
if (!(flags & WINED3D_MAP_NOOVERWRITE))
buffer->flags &= ~WINED3D_BUFFER_NOSYNC;
- else if (!buffer_is_dirty(buffer))
+ else if (!dirty)
buffer->flags |= WINED3D_BUFFER_NOSYNC;
}
More information about the wine-cvs
mailing list