Commit a8873ef5 by Jamie Madill

Fix warnings in PathRenderingTest.cpp.

Certain warnings are suppressed in Chromium but not standalone ANGLE. We should enable those warnings for ANGLE specifically, in a follow-up CL. BUG=angleproject:1382 Change-Id: I12491a61b0f349c5937a1e5d9985c8da1d76e0dc Reviewed-on: https://chromium-review.googlesource.com/358107Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent d59ca052
...@@ -751,11 +751,14 @@ class CHROMIUMPathRenderingDrawTest : public ANGLETest ...@@ -751,11 +751,14 @@ class CHROMIUMPathRenderingDrawTest : public ANGLETest
ASSERT_GL_NO_ERROR(); ASSERT_GL_NO_ERROR();
} }
void verifyTestPatternFill(GLint x, GLint y) void verifyTestPatternFill(GLfloat flx, GLfloat fly)
{ {
static const GLint kFillCoords[] = {55, 54, 50, 28, 66, 63}; static const GLint kFillCoords[] = {55, 54, 50, 28, 66, 63};
static const angle::GLColor kBlue = {0, 0, 255, 255}; static const angle::GLColor kBlue = {0, 0, 255, 255};
GLint x = static_cast<GLint>(flx);
GLint y = static_cast<GLint>(fly);
for (size_t i = 0; i < 6; i += 2) for (size_t i = 0; i < 6; i += 2)
{ {
GLint fx = kFillCoords[i]; GLint fx = kFillCoords[i];
...@@ -763,11 +766,14 @@ class CHROMIUMPathRenderingDrawTest : public ANGLETest ...@@ -763,11 +766,14 @@ class CHROMIUMPathRenderingDrawTest : public ANGLETest
EXPECT_TRUE(CheckPixels(x + fx, y + fy, 1, 1, 0, kBlue)); EXPECT_TRUE(CheckPixels(x + fx, y + fy, 1, 1, 0, kBlue));
} }
} }
void verifyTestPatternBg(GLint x, GLint y) void verifyTestPatternBg(GLfloat fx, GLfloat fy)
{ {
static const GLint kBackgroundCoords[] = {80, 80, 20, 20, 90, 1}; static const GLint kBackgroundCoords[] = {80, 80, 20, 20, 90, 1};
static const angle::GLColor kExpectedColor = {0, 0, 0, 0}; static const angle::GLColor kExpectedColor = {0, 0, 0, 0};
GLint x = static_cast<GLint>(fx);
GLint y = static_cast<GLint>(fy);
for (size_t i = 0; i < 6; i += 2) for (size_t i = 0; i < 6; i += 2)
{ {
GLint bx = kBackgroundCoords[i]; GLint bx = kBackgroundCoords[i];
...@@ -776,8 +782,11 @@ class CHROMIUMPathRenderingDrawTest : public ANGLETest ...@@ -776,8 +782,11 @@ class CHROMIUMPathRenderingDrawTest : public ANGLETest
} }
} }
void verifyTestPatternStroke(GLint x, GLint y) void verifyTestPatternStroke(GLfloat fx, GLfloat fy)
{ {
GLint x = static_cast<GLint>(fx);
GLint y = static_cast<GLint>(fy);
// Inside the stroke we should have green. // Inside the stroke we should have green.
static const angle::GLColor kGreen = {0, 255, 0, 255}; static const angle::GLColor kGreen = {0, 255, 0, 255};
EXPECT_TRUE(CheckPixels(x + 50, y + 53, 1, 1, 0, kGreen)); EXPECT_TRUE(CheckPixels(x + 50, y + 53, 1, 1, 0, kGreen));
......
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