Skip to content

W
wine-winehq
Commit 422d71f6 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Alexandre Julliard
Browse files
Options

wined3d: Fix a deadlock that may occur during initialization.

parent 808c5dbe
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
dlls/wined3d/directx.c
View file @ 422d71f6
...@@ -770,6 +770,9 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { ...@@ -770,6 +770,9 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
} }
} }
} }
LEAVE_GL();
/* Now work out what GL support this card really has */ /* Now work out what GL support this card really has */
#define USE_GL_FUNC(type, pfn, ext, replace) { \ #define USE_GL_FUNC(type, pfn, ext, replace) { \
DWORD ver = ver_for_ext(ext); \ DWORD ver = ver_for_ext(ext); \
...@@ -784,6 +787,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { ...@@ -784,6 +787,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
WGL_EXT_FUNCS_GEN; WGL_EXT_FUNCS_GEN;
#undef USE_GL_FUNC #undef USE_GL_FUNC
ENTER_GL();
/* Now mark all the extensions supported which are included in the opengl core version. Do this *after* /* Now mark all the extensions supported which are included in the opengl core version. Do this *after*
* loading the functions, otherwise the code above will load the extension entry points instead of the * loading the functions, otherwise the code above will load the extension entry points instead of the
* core functions, which may not work * core functions, which may not work
......
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