Use D3D11 Renderer for ANGLE Tests.

Many of our tests rely on extensions and ES3 support. Until we have the ability to switch between Renderers for specific tests, the D3D11 Renderer should enable many failing tests to pass. Also fix a double-delete crash in the test cleanup routine. BUG=angle:702 Change-Id: I5e615ca1a35bd109d9f7bcbb5fa90b88e09157bd Reviewed-on: https://chromium-review.googlesource.com/209102Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Zhenyao Mo <zmo@chromium.org>

Use D3D11 Renderer for ANGLE Tests.
34b66f32 · Jamie Madill · 6b19b002 · 34b66f32
Commit 34b66f32 authored Jul 23, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 5 deletions

ANGLETest.cpp tests/angle_tests/ANGLETest.cpp +20 -5

No files found.
--- a/tests/angle_tests/ANGLETest.cpp
+++ b/tests/angle_tests/ANGLETest.cpp
 #include "ANGLETest.h"
 ANGLETest::ANGLETest()
-    : mTestPlatform(EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE),
+    : mTestPlatform(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE),
      mClientVersion(2),
      mWidth(1280),
      mHeight(720),
@@ -349,10 +349,25 @@ bool ANGLETest::createEGLContext()
 bool ANGLETest::destroyEGLContext()
 {
-    eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    if (mDisplay != EGL_NO_DISPLAY)
-    eglDestroySurface(mDisplay, mSurface);
+    {
-    eglDestroyContext(mDisplay, mContext);
+        eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-    eglTerminate(mDisplay);
+        if (mSurface != EGL_NO_SURFACE)
+        {
+            eglDestroySurface(mDisplay, mSurface);
+            mSurface = EGL_NO_SURFACE;
+        }
+        if (mContext != EGL_NO_CONTEXT)
+        {
+            eglDestroyContext(mDisplay, mContext);
+            mContext = EGL_NO_CONTEXT;
+        }
+        eglTerminate(mDisplay);
+        mDisplay = EGL_NO_DISPLAY;
+    }
    return true;
 }