Skip to content

A
angle
Commit db74f18e by Jamie Madill
Options

Make the EGLDisplay a non-static member of ANGLETest.

We would create and destroy the display with every test, as it was not part of the environment. BUG=angle:730 Change-Id: Iae003f13c8e975ae57d3af2d74f9f058a560046f Reviewed-on: https://chromium-review.googlesource.com/213291Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 586666ce
Showing with 6 additions and 3 deletions
tests/angle_tests/ANGLETest.cpp
...@@ -11,11 +11,14 @@ ANGLETest::ANGLETest() ...@@ -11,11 +11,14 @@ ANGLETest::ANGLETest()
mAlphaBits(-1), mAlphaBits(-1),
mDepthBits(-1), mDepthBits(-1),
mStencilBits(-1), mStencilBits(-1),
mMultisample(false) mMultisample(false),
mConfig(0),
mSurface(EGL_NO_SURFACE),
mContext(EGL_NO_CONTEXT),
mDisplay(EGL_NO_DISPLAY)
{ {
} }
EGLDisplay ANGLETest::mDisplay = 0;
EGLNativeWindowType ANGLETest::mNativeWindow = 0; EGLNativeWindowType ANGLETest::mNativeWindow = 0;
EGLNativeDisplayType ANGLETest::mNativeDisplay = 0; EGLNativeDisplayType ANGLETest::mNativeDisplay = 0;
......
tests/angle_tests/ANGLETest.h
...@@ -98,8 +98,8 @@ class ANGLETest : public testing::Test ...@@ -98,8 +98,8 @@ class ANGLETest : public testing::Test
EGLConfig mConfig; EGLConfig mConfig;
EGLSurface mSurface; EGLSurface mSurface;
EGLContext mContext; EGLContext mContext;
EGLDisplay mDisplay;
static EGLDisplay mDisplay;
static EGLNativeWindowType mNativeWindow; static EGLNativeWindowType mNativeWindow;
static EGLNativeDisplayType mNativeDisplay; static EGLNativeDisplayType mNativeDisplay;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment