Maarten Lankhorst : wined3d: Fix a deadlock that may occur during initialization.
Alexandre Julliard
julliard at winehq.org
Thu Jul 3 06:35:20 CDT 2008
Module: wine
Branch: master
Commit: 422d71f630c8f90ca280494eaef8fda7674d1c77
URL: http://source.winehq.org/git/wine.git/?a=commit;h=422d71f630c8f90ca280494eaef8fda7674d1c77
Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date: Wed Jul 2 20:08:10 2008 -0700
wined3d: Fix a deadlock that may occur during initialization.
---
dlls/wined3d/directx.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index acb147e..8811d0a 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -770,6 +770,9 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
}
}
}
+
+ LEAVE_GL();
+
/* Now work out what GL support this card really has */
#define USE_GL_FUNC(type, pfn, ext, replace) { \
DWORD ver = ver_for_ext(ext); \
@@ -784,6 +787,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
WGL_EXT_FUNCS_GEN;
#undef USE_GL_FUNC
+ ENTER_GL();
/* 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
* core functions, which may not work
More information about the wine-cvs
mailing list