Henri Verbeet : wined3d: Don' t reuse random GL contexts during initialization.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b5da7f49d332ed5d64be1256e14035af74a7efa2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b5da7f49d332ed5d64be1256e14035af74a7efa2

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Jul  2 10:01:37 2009 +0200

wined3d: Don't reuse random GL contexts during initialization.

Obviously there's no guarantee about the state of such a context. The specific
problem is that it might have GL_UNPACK_CLIENT_STORAGE_APPLE enabled, causing
some glTexImage2D() calls to fail, but it's a bad idea in general.

---

 dlls/wined3d/directx.c |   99 ++++++++++++++++++++++++------------------------
 1 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 9e50b0d..13651e6 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -198,7 +198,6 @@ glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT];
  */
 
 static int             wined3d_fake_gl_context_ref = 0;
-static BOOL            wined3d_fake_gl_context_foreign;
 static BOOL            wined3d_fake_gl_context_available = FALSE;
 static HDC             wined3d_fake_gl_context_hdc = NULL;
 static HWND            wined3d_fake_gl_context_hwnd = NULL;
@@ -228,7 +227,8 @@ static void WineD3D_ReleaseFakeGLContext(void) {
 
     TRACE_(d3d_caps)("decrementing ref from %i\n", wined3d_fake_gl_context_ref);
     if (0 == (--wined3d_fake_gl_context_ref) ) {
-        if(!wined3d_fake_gl_context_foreign && glCtx) {
+        if (glCtx)
+        {
             TRACE_(d3d_caps)("destroying fake GL context\n");
             if (!pwglMakeCurrent(NULL, NULL))
             {
@@ -249,64 +249,63 @@ static void WineD3D_ReleaseFakeGLContext(void) {
 }
 
 static BOOL WineD3D_CreateFakeGLContext(void) {
+    PIXELFORMATDESCRIPTOR pfd;
     HGLRC glCtx = NULL;
+    int iPixelFormat;
 
     EnterCriticalSection(&wined3d_fake_gl_context_cs);
 
     TRACE("getting context...\n");
     if(wined3d_fake_gl_context_ref > 0) goto ret;
 
-    wined3d_fake_gl_context_foreign = TRUE;
-
-    glCtx = pwglGetCurrentContext();
-    if (!glCtx) {
-        PIXELFORMATDESCRIPTOR pfd;
-        int iPixelFormat;
+    /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */
+    wined3d_fake_gl_context_hwnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window",
+            WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL);
+    if (!wined3d_fake_gl_context_hwnd)
+    {
+        ERR("HWND creation failed!\n");
+        goto fail;
+    }
 
-        wined3d_fake_gl_context_foreign = FALSE;
+    wined3d_fake_gl_context_hdc = GetDC(wined3d_fake_gl_context_hwnd);
+    if (!wined3d_fake_gl_context_hdc)
+    {
+        ERR("GetDC failed!\n");
+        goto fail;
+    }
 
-        /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes */
-        wined3d_fake_gl_context_hwnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL);
-        if(!wined3d_fake_gl_context_hwnd) {
-            ERR("HWND creation failed!\n");
-            goto fail;
-        }
-        wined3d_fake_gl_context_hdc = GetDC(wined3d_fake_gl_context_hwnd);
-        if(!wined3d_fake_gl_context_hdc) {
-            ERR("GetDC failed!\n");
-            goto fail;
-        }
+    /* PixelFormat selection */
+    ZeroMemory(&pfd, sizeof(pfd));
+    pfd.nSize = sizeof(pfd);
+    pfd.nVersion = 1;
+    pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW; /* PFD_GENERIC_ACCELERATED */
+    pfd.iPixelType = PFD_TYPE_RGBA;
+    pfd.cColorBits = 32;
+    pfd.iLayerType = PFD_MAIN_PLANE;
+
+    iPixelFormat = ChoosePixelFormat(wined3d_fake_gl_context_hdc, &pfd);
+    if (!iPixelFormat)
+    {
+        /* If this happens something is very wrong as ChoosePixelFormat barely fails. */
+        ERR("Can't find a suitable iPixelFormat.\n");
+        goto fail;
+    }
+    DescribePixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, sizeof(pfd), &pfd);
+    SetPixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, &pfd);
 
-        /* PixelFormat selection */
-        ZeroMemory(&pfd, sizeof(pfd));
-        pfd.nSize      = sizeof(pfd);
-        pfd.nVersion   = 1;
-        pfd.dwFlags    = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/
-        pfd.iPixelType = PFD_TYPE_RGBA;
-        pfd.cColorBits = 32;
-        pfd.iLayerType = PFD_MAIN_PLANE;
-
-        iPixelFormat = ChoosePixelFormat(wined3d_fake_gl_context_hdc, &pfd);
-        if(!iPixelFormat) {
-            /* If this happens something is very wrong as ChoosePixelFormat barely fails */
-            ERR("Can't find a suitable iPixelFormat\n");
-            goto fail;
-        }
-        DescribePixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, sizeof(pfd), &pfd);
-        SetPixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, &pfd);
-
-        /* Create a GL context */
-        glCtx = pwglCreateContext(wined3d_fake_gl_context_hdc);
-        if (!glCtx) {
-            WARN_(d3d_caps)("Error creating default context for capabilities initialization\n");
-            goto fail;
-        }
+    /* Create a GL context. */
+    glCtx = pwglCreateContext(wined3d_fake_gl_context_hdc);
+    if (!glCtx)
+    {
+        WARN_(d3d_caps)("Error creating default context for capabilities initialization.\n");
+        goto fail;
+    }
 
-        /* Make it the current GL context */
-        if (!pwglMakeCurrent(wined3d_fake_gl_context_hdc, glCtx)) {
-            ERR_(d3d_caps)("Failed to make fake GL context current.\n");
-            goto fail;
-        }
+    /* Make it the current GL context. */
+    if (!pwglMakeCurrent(wined3d_fake_gl_context_hdc, glCtx))
+    {
+        ERR_(d3d_caps)("Failed to make fake GL context current.\n");
+        goto fail;
     }
     context_set_last_device(NULL);