Revert "EGLWindow: specify the device type only on d3d platform"

Causing failures in EGLSurfaceTest.MakeCurrentTwice on Windows BUG=angleproject:892 This reverts commit 118e7195. Change-Id: Ifbb17d1c9bc0390abadbfb8f78cf14dbf1bb8e83 Reviewed-on: https://chromium-review.googlesource.com/269950Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Revert "EGLWindow: specify the device type only on d3d platform"
4ea209f1 · Jamie Madill · 4c825e68 · 4ea209f1
Commit 4ea209f1 authored May 07, 2015 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 15 deletions

EGLWindow.cpp util/EGLWindow.cpp +9 -15

No files found.
--- a/util/EGLWindow.cpp
+++ b/util/EGLWindow.cpp
@@ -99,22 +99,16 @@ bool EGLWindow::initializeGL(OSWindow *osWindow)
        return false;
    }
-    std::vector<EGLint> displayAttributes;
+    const EGLint displayAttributes[] =
-    displayAttributes.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
+    {
-    displayAttributes.push_back(mPlatform.renderer);
+        EGL_PLATFORM_ANGLE_TYPE_ANGLE,              mPlatform.renderer,
-    displayAttributes.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE);
+        EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, mPlatform.majorVersion,
-    displayAttributes.push_back(mPlatform.majorVersion);
+        EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE, mPlatform.minorVersion,
-    displayAttributes.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE);
+        EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE,       mPlatform.deviceType,
-    displayAttributes.push_back(mPlatform.minorVersion);
+        EGL_NONE,
+    };
-    if (mPlatform.renderer == EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE || mPlatform.renderer == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
-    {
-        displayAttributes.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE);
-        displayAttributes.push_back(mPlatform.deviceType);
-    }
-    displayAttributes.push_back(EGL_NONE);
-    mDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, osWindow->getNativeDisplay(), displayAttributes.data());
+    mDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, osWindow->getNativeDisplay(), displayAttributes);
    if (mDisplay == EGL_NO_DISPLAY)
    {
        destroyGL();