wined3d: CreateFakeGLContxt/ReleaseFakeGLContext doesn't need ENTER_GL/LEAVE_GL…

wined3d: CreateFakeGLContxt/ReleaseFakeGLContext doesn't need ENTER_GL/LEAVE_GL and they are making GDI calls. The removal of ENTER_GL from the fake context code, requires the addition of ENTER_GL/LEAVE_GL to FillGLCaps which was protected by the fake context code before.

wined3d: CreateFakeGLContxt/ReleaseFakeGLContext doesn't need ENTER_GL/LEAVE_GL…
46f33f4f · Roderick Colenbrander · Alexandre Julliard · 1a36ccc0 · 46f33f4f
Commit 46f33f4f authored Sep 29, 2007 by Roderick Colenbrander Committed by Alexandre Julliard Oct 01, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

directx.c dlls/wined3d/directx.c +3 -3

No files found.
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -192,13 +192,11 @@ static void WineD3D_ReleaseFakeGLContext(void) {
    assert(wined3d_fake_gl_context_ref >= 0);

    LeaveCriticalSection(&wined3d_fake_gl_context_cs);
-    LEAVE_GL();
 }

 static BOOL WineD3D_CreateFakeGLContext(void) {
    HGLRC glCtx = NULL;

-    ENTER_GL();
    EnterCriticalSection(&wined3d_fake_gl_context_cs);

    TRACE("getting context...\n");
@@ -273,7 +271,6 @@ static BOOL WineD3D_CreateFakeGLContext(void) {
    wined3d_fake_gl_context_hwnd = NULL;
    if(glCtx) pwglDeleteContext(glCtx);
    LeaveCriticalSection(&wined3d_fake_gl_context_cs);
-    LEAVE_GL();
    return FALSE;
 }

@@ -419,6 +416,8 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {

    TRACE_(d3d_caps)("(%p)\n", gl_info);

+    ENTER_GL();
+
    gl_string = (const char *) glGetString(GL_RENDERER);
    if (NULL == gl_string)
 	gl_string = "None";
@@ -1130,6 +1129,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
            }
        }
    }
+    LEAVE_GL();

    return return_value;
 }