Vulkan: Workaround NVIDIA not sharing with OpenGL window.

src/tests/test_utils/ANGLETest.cpp

@@ -232,12 +232,6 @@ ANGLETest::ANGLETest()
 {
     mEGLWindow =
         new EGLWindow(GetParam().majorVersion, GetParam().minorVersion, GetParam().eglParameters);
-
-    // Default vulkan layers to enabled.
-    if (GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE)
-    {
-        mEGLWindow->setVulkanLayersEnabled(true);
-    }
 }
 
 ANGLETest::~ANGLETest()
@@ -254,6 +248,28 @@ void ANGLETest::SetUp()
     angle::g_testPlatformInstance.enableMessages();
     angle::g_testPlatformInstance.setCurrentTest(this);
 
+    // Default vulkan layers to enabled.
+    EGLint renderer = GetParam().getRenderer();
+    if (renderer == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE)
+    {
+        mEGLWindow->setVulkanLayersEnabled(true);
+    }
+
+    // Workaround for NVIDIA not being able to share OpenGL and Vulkan contexts.
+    bool needsWindowSwap = mLastRendererType.valid() &&
+                           ((renderer != EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE) !=
+                            (mLastRendererType.value() != EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE));
+
+    if (needsWindowSwap)
+    {
+        DestroyTestWindow();
+        if (!InitTestWindow())
+        {
+            FAIL() << "Failed to create ANGLE test window.";
+        }
+    }
+    mLastRendererType = renderer;
+
     // Resize the window before creating the context so that the first make current
     // sets the viewport and scissor box to the right size.
     bool needSwap = false;
@@ -909,7 +925,8 @@ void ANGLETest::ignoreD3D11SDKLayersWarnings()
     mIgnoreD3D11SDKLayersWarnings = true;
 }
 
-OSWindow *ANGLETest::mOSWindow = NULL;
+OSWindow *ANGLETest::mOSWindow = nullptr;
+Optional<EGLint> ANGLETest::mLastRendererType;
 
 void ANGLETestEnvironment::SetUp()
 {

src/tests/test_utils/ANGLETest.h

@@ -256,6 +256,9 @@ class ANGLETest : public ::testing::TestWithParam<angle::PlatformParameters>
     GLuint mQuadVertexBuffer;
 
     static OSWindow *mOSWindow;
+
+    // Workaround for NVIDIA not being able to share a window with OpenGL and Vulkan.
+    static Optional<EGLint> mLastRendererType;
 };
 
 class ANGLETestEnvironment : public testing::Environment