Module: wine Branch: master Commit: 42c2d06bc06fe4d256c49420e63e46aa81db26d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c2d06bc06fe4d256c49420e6...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Aug 13 10:03:04 2009 +0200
wined3d: Don't make wgl calls from under the GL lock.
---
dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5cd017e..c158f39 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1545,6 +1545,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) } checkGLcall("extension detection");
+ LEAVE_GL(); + /* In some cases the number of texture stages can be larger than the number * of samplers. The GF4 for example can use only 2 samplers (no fragment * shaders), but 8 texture stages (register combiners). */ @@ -2052,7 +2054,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) } } } - LEAVE_GL();
fixup_extensions(gl_info, gl_renderer); add_gl_compat_wrappers(gl_info);