Stefan Dösinger : wined3d: Don' t use GL_MAP_FLUSH_EXPLICIT_BIT without GL_MAP_WRITE_BIT.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 24e2308670481513c62482d1e127e83fdf41c2f4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=24e2308670481513c62482d1e1...

Author: Stefan Dösinger 
Date:   Mon Feb  8 12:24:36 2010 +0100

wined3d: Don't use GL_MAP_FLUSH_EXPLICIT_BIT without GL_MAP_WRITE_BIT.

---

dlls/wined3d/buffer.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index 3c7a2b9..e22d311 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -1061,9 +1061,9 @@ static DWORD buffer_sanitize_flags(DWORD flags)

static GLbitfield buffer_gl_map_flags(DWORD d3d_flags)
 {
-    GLbitfield ret = GL_MAP_FLUSH_EXPLICIT_BIT;
+    GLbitfield ret = 0;

-    if (!(d3d_flags & WINED3DLOCK_READONLY)) ret |= GL_MAP_WRITE_BIT;
+    if (!(d3d_flags & WINED3DLOCK_READONLY)) ret = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT;

if (d3d_flags & (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE))
     {