commit e5014a97e29c0d88d47c693ed168c00f61551e53
author Geoff Lang <geofflang@chromium.org> Thu Oct 10 10:16:47 2013 -0400
committer Geoff Lang <geofflang@chromium.org> Thu Oct 10 10:17:51 2013 -0400
tree f8105ac6d45c3f9b3098cd49c7058ec85575cde3
parent c273f370ad776f0ab898397849b3da536a864ec7

Only check for missmatched HWND process IDs if swap chain creation fails.

R=shannonwoods@chromium.org,zmo@chromium.org,jmadill@chromium.org

Review URL: https://codereview.appspot.com/14540050

src/libGLESv2/renderer/SwapChain11.cpp

diff --git a/src/libGLESv2/renderer/SwapChain11.cpp b/src/libGLESv2/renderer/SwapChain11.cpp
index a50db3b..2e0f0c2 100644
--- a/src/libGLESv2/renderer/SwapChain11.cpp
+++ b/src/libGLESv2/renderer/SwapChain11.cpp
@@ -465,18 +465,6 @@
 
     if (mWindow)
     {
-        // We cannot create a swap chain for an HWND that is owned by a different process
-        DWORD currentProcessId = GetCurrentProcessId();
-        DWORD wndProcessId;
-        GetWindowThreadProcessId(mWindow, &wndProcessId);
-
-        if (currentProcessId != wndProcessId)
-        {
-            ERR("Could not create swap chain, window owned by different process");
-            release();
-            return EGL_BAD_NATIVE_WINDOW;
-        }
-
         IDXGIFactory *factory = mRenderer->getDxgiFactory();
 
         DXGI_SWAP_CHAIN_DESC swapChainDesc = {0};
@@ -508,7 +496,21 @@
             }
             else
             {
-                return EGL_BAD_ALLOC;
+                // We cannot create a swap chain for an HWND that is owned by a different process on some versions of
+                // windows
+                DWORD currentProcessId = GetCurrentProcessId();
+                DWORD wndProcessId;
+                GetWindowThreadProcessId(mWindow, &wndProcessId);
+
+                if (currentProcessId != wndProcessId)
+                {
+                    ERR("Could not create swap chain, window owned by different process");
+                    return EGL_BAD_NATIVE_WINDOW;
+                }
+                else
+                {
+                    return EGL_BAD_ALLOC;
+                }
             }
         }