Make EGLThreadTest cross-platform.

src/tests/angle_end2end_tests.gypi

@@ -125,6 +125,7 @@
             '<(angle_path)/src/tests/egl_tests/EGLSanityCheckTest.cpp',
             '<(angle_path)/src/tests/egl_tests/EGLSurfacelessContextTest.cpp',
             '<(angle_path)/src/tests/egl_tests/EGLSurfaceTest.cpp',
+            '<(angle_path)/src/tests/egl_tests/EGLThreadTest.cpp',
             '<(angle_path)/src/tests/test_utils/ANGLETest.cpp',
             '<(angle_path)/src/tests/test_utils/ANGLETest.h',
             '<(angle_path)/src/tests/test_utils/angle_test_configs.cpp',
@@ -144,8 +145,6 @@
             '<(angle_path)/src/tests/egl_tests/EGLPresentPathD3D11Test.cpp',
             '<(angle_path)/src/tests/egl_tests/EGLStreamTest.cpp',
             '<(angle_path)/src/tests/egl_tests/EGLSyncControlTest.cpp',
-            # TODO(cwallez) for Linux, requires a portable implementation of threads
-            '<(angle_path)/src/tests/egl_tests/EGLThreadTest.cpp',
             '<(angle_path)/src/tests/egl_tests/media/yuvtest.inl',
         ],
         'angle_end2end_tests_x11_sources':

src/tests/egl_tests/EGLThreadTest.cpp

+//
+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// EGLThreadTest.h: Tests multi-threaded uses of EGL.
+
 #include "gtest/gtest.h"
+#include "system_utils.h"
+
+#include <thread>
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
-typedef EGLDisplay EGLAPIENTRY EGLGetDisplay(EGLNativeDisplayType display_id);
-typedef EGLBoolean EGLAPIENTRY EGLInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor);
-typedef EGLContext EGLAPIENTRY EGLGetCurrentContext(void);
-typedef EGLSurface EGLAPIENTRY EGLGetCurrentSurface(EGLint readdraw);
-typedef EGLBoolean EGLAPIENTRY EGLTerminate(EGLDisplay dpy);
-
 class EGLThreadTest : public testing::Test
 {
   public:
-    virtual void SetUp() {}
-    virtual void TearDown() {}
-
-    EGLGetDisplay *mGetDisplay;
-    EGLInitialize *mInitialize;
-    EGLGetCurrentContext *mGetCurrentContext;
-    EGLGetCurrentSurface *mGetCurrentSurface;
-
-    EGLDisplay mDisplay;
-
-    HMODULE mEGL;
-    HMODULE mGLESv2;
-
-    static DWORD WINAPI ThreadingTestEntryPoint(LPVOID thisPointer);
+    void threadingTest();
 
-  private:
-    void ThreadingTest();
+  protected:
+    EGLDisplay mDisplay = EGL_NO_DISPLAY;
 };
 
-DWORD WINAPI EGLThreadTest::ThreadingTestEntryPoint(LPVOID lpParameter)
+void EGLThreadTest::threadingTest()
 {
-    EGLThreadTest *test = (EGLThreadTest *)lpParameter;
-    test->ThreadingTest();
-    return 0;
-}
-
-void EGLThreadTest::ThreadingTest()
-{
-    mEGL    = LoadLibrary(TEXT(ANGLE_EGL_LIBRARY_NAME ".dll"));
-    mGLESv2 = LoadLibrary(TEXT(ANGLE_GLESV2_LIBRARY_NAME ".dll"));
-
-    EXPECT_TRUE(mEGL != nullptr);
-    EXPECT_TRUE(mGLESv2 != nullptr);
-
-    mGetDisplay = (EGLGetDisplay *)GetProcAddress(mEGL, "eglGetDisplay");
-    mInitialize = (EGLInitialize *)GetProcAddress(mEGL, "eglInitialize");
-    mGetCurrentContext = (EGLGetCurrentContext *)GetProcAddress(mEGL, "eglGetCurrentContext");
-    mGetCurrentSurface = (EGLGetCurrentSurface *)GetProcAddress(mEGL, "eglGetCurrentSurface");
-
-    EXPECT_TRUE(mGetDisplay != nullptr);
-    EXPECT_TRUE(mInitialize != nullptr);
-    EXPECT_TRUE(mGetCurrentContext != nullptr);
-    EXPECT_TRUE(mGetCurrentSurface != nullptr);
-
-    mDisplay = mGetDisplay(EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE);
+    mDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
 
-    EXPECT_TRUE(mDisplay!= EGL_NO_DISPLAY);
+    EXPECT_TRUE(mDisplay != EGL_NO_DISPLAY);
 
-    mInitialize(mDisplay, nullptr, nullptr);
-    mGetCurrentContext();
+    eglInitialize(mDisplay, nullptr, nullptr);
+    eglGetCurrentContext();
 }
 
-TEST_F(EGLThreadTest, thread_init_crash)
+// Test a bug in our EGL TLS implementation.
+TEST_F(EGLThreadTest, ThreadInitCrash)
 {
-    DWORD threadId;
-    HANDLE threadHandle =
-        CreateThread(nullptr, 0, EGLThreadTest::ThreadingTestEntryPoint, this, 0, &threadId);
-    EXPECT_TRUE(threadHandle != nullptr);
+    std::thread runner(&EGLThreadTest::threadingTest, this);
 
     // wait for signal from thread
-    DWORD waitResult = WaitForSingleObject(threadHandle, 1000);
-    EXPECT_EQ(waitResult, WAIT_OBJECT_0);
+    runner.join();
 
     // crash, because the TLS value is NULL on main thread
-    mGetCurrentSurface(EGL_DRAW);
-    mGetCurrentContext();
+    eglGetCurrentSurface(EGL_DRAW);
+    eglGetCurrentContext();
 
-    auto terminate = (EGLTerminate *)GetProcAddress(mEGL, "eglTerminate");
-    terminate(mDisplay);
+    eglTerminate(mDisplay);
 }