Commit 42c2d06b authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Don't make wgl calls from under the GL lock.

parent 326f9b3f
...@@ -1545,6 +1545,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) ...@@ -1545,6 +1545,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
} }
checkGLcall("extension detection"); checkGLcall("extension detection");
LEAVE_GL();
/* In some cases the number of texture stages can be larger than the number /* 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 * of samplers. The GF4 for example can use only 2 samplers (no fragment
* shaders), but 8 texture stages (register combiners). */ * shaders), but 8 texture stages (register combiners). */
...@@ -2052,7 +2054,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) ...@@ -2052,7 +2054,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
} }
} }
} }
LEAVE_GL();
fixup_extensions(gl_info, gl_renderer); fixup_extensions(gl_info, gl_renderer);
add_gl_compat_wrappers(gl_info); add_gl_compat_wrappers(gl_info);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment