EGLSurfaceTest: specify the device type only on d3d platform

BUG=angleproject:892 Change-Id: If09cf30122d97590f07447147e6d54c2e4157f9e Reviewed-on: https://chromium-review.googlesource.com/269828Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

EGLSurfaceTest: specify the device type only on d3d platform
06394f66 · Corentin Wallez · bf9e4050 · 06394f66
Commit 06394f66 authored May 07, 2015 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 8 deletions

EGLSurfaceTest.cpp src/tests/standalone_tests/EGLSurfaceTest.cpp +14 -8

No files found.
--- a/src/tests/standalone_tests/EGLSurfaceTest.cpp
+++ b/src/tests/standalone_tests/EGLSurfaceTest.cpp
@@ -83,16 +83,22 @@ class EGLSurfaceTest : public testing::Test
        PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT"));
        ASSERT_TRUE(eglGetPlatformDisplayEXT != nullptr);

-        const EGLint displayAttributes[] =
+        std::vector<EGLint> displayAttributes;
+        displayAttributes.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
+        displayAttributes.push_back(platformType);
+        displayAttributes.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE);
+        displayAttributes.push_back(EGL_DONT_CARE);
+        displayAttributes.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE);
+        displayAttributes.push_back(EGL_DONT_CARE);
+
+        if (platformType == EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE || platformType == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
        {
-            EGL_PLATFORM_ANGLE_TYPE_ANGLE, platformType,
-            EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, EGL_DONT_CARE,
-            EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE, EGL_DONT_CARE,
-            EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE,
-            EGL_NONE,
-        };
+            displayAttributes.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE);
+            displayAttributes.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
+        }
+        displayAttributes.push_back(EGL_NONE);

-        mDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, mOSWindow->getNativeDisplay(), displayAttributes);
+        mDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, mOSWindow->getNativeDisplay(), displayAttributes.data());
        ASSERT_TRUE(mDisplay != EGL_NO_DISPLAY);

        EGLint majorVersion, minorVersion;