Henri Verbeet : wined3d: Add GL locking to match_fbo_tex_update().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8cf63f0aee2fb2d6629c02418813d3712a8ce46a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8cf63f0aee2fb2d6629c024188...

Author: Henri Verbeet 
Date:   Thu Mar 25 22:51:21 2010 +0100

wined3d: Add GL locking to match_fbo_tex_update().

---

dlls/wined3d/directx.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 280f06d..b136eb4 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -669,6 +669,7 @@ static BOOL match_broken_nv_clip(const struct wined3d_gl_info *gl_info, const ch
     return ret;
 }

+/* Context activation is done by the caller. */
 static BOOL match_fbo_tex_update(const struct wined3d_gl_info *gl_info, const char *gl_renderer,
         enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device)
 {
@@ -680,6 +681,8 @@ static BOOL match_fbo_tex_update(const struct wined3d_gl_info *gl_info, const ch

memset(data, 0xcc, sizeof(data));

+    ENTER_GL();
+
     glGenTextures(1, &tex);
     glBindTexture(GL_TEXTURE_2D, tex);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -716,6 +719,8 @@ static BOOL match_fbo_tex_update(const struct wined3d_gl_info *gl_info, const ch
     glDeleteTextures(1, &tex);
     checkGLcall("glDeleteTextures");

+    LEAVE_GL();
+
     return *(DWORD *)data == 0x11111111;
 }