Skip to content

A
angle
Commit 7f8dc494 by Geoff Lang
Options

Revert "ANGLETest::SetUp: resize the window only if needed."

Going to try reverting this as a potential fix to failures seen on the bots. Can re-land in the morning if the failures don't clear up. Failures seen on all windows bots now. This reverts commit 15ca8296. Change-Id: Ic2904e00e8d53b2cc8939b36953f47f131c5e6c2 Reviewed-on: https://chromium-review.googlesource.com/287846Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent e2bfe2cd
Showing with 10 additions and 7 deletions
src/tests/test_utils/ANGLETest.cpp
...@@ -17,16 +17,14 @@ ANGLETest::~ANGLETest() ...@@ -17,16 +17,14 @@ ANGLETest::~ANGLETest()
void ANGLETest::SetUp() void ANGLETest::SetUp()
{ {
if (!createEGLContext()) if (!ResizeWindow(mWidth, mHeight))
{ {
FAIL() << "egl context creation failed."; FAIL() << "Failed to resize ANGLE test window.";
} }
if (mOSWindow->getWidth() != mWidth || mOSWindow->getHeight() != mHeight) if (!createEGLContext())
{
if (!mOSWindow->resize(mWidth, mHeight))
{ {
FAIL() << "Failed to resize ANGLE test window."; FAIL() << "egl context creation failed.";
} }
// Swap the buffers so that the default framebuffer picks up the resize // Swap the buffers so that the default framebuffer picks up the resize
...@@ -38,7 +36,6 @@ void ANGLETest::SetUp() ...@@ -38,7 +36,6 @@ void ANGLETest::SetUp()
// taking OpenGL traces can guess the size of the default framebuffer and show it // taking OpenGL traces can guess the size of the default framebuffer and show it
// in their UIs // in their UIs
glViewport(0, 0, mWidth, mHeight); glViewport(0, 0, mWidth, mHeight);
}
} }
void ANGLETest::TearDown() void ANGLETest::TearDown()
...@@ -253,6 +250,11 @@ bool ANGLETest::DestroyTestWindow() ...@@ -253,6 +250,11 @@ bool ANGLETest::DestroyTestWindow()
return true; return true;
} }
bool ANGLETest::ResizeWindow(int width, int height)
{
return mOSWindow->resize(width, height);
}
void ANGLETest::SetWindowVisible(bool isVisible) void ANGLETest::SetWindowVisible(bool isVisible)
{ {
mOSWindow->setVisible(isVisible); mOSWindow->setVisible(isVisible);
......
src/tests/test_utils/ANGLETest.h
...@@ -67,6 +67,7 @@ class ANGLETest : public ::testing::TestWithParam<angle::PlatformParameters> ...@@ -67,6 +67,7 @@ class ANGLETest : public ::testing::TestWithParam<angle::PlatformParameters>
public: public:
static bool InitTestWindow(); static bool InitTestWindow();
static bool DestroyTestWindow(); static bool DestroyTestWindow();
static bool ResizeWindow(int width, int height);
static void SetWindowVisible(bool isVisible); static void SetWindowVisible(bool isVisible);
protected: protected:
......
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