Commit 0344b1e5 by Geoff Lang Committed by Jamie Madill

Fix float-to-int conversion warnings in the path rendering tests.

BUG=angleproject:1382 Change-Id: I586cd4a03d06a6ec87b6a57342b7f8d0ed0d9cd8 Reviewed-on: https://chromium-review.googlesource.com/354031Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent f8559282
...@@ -274,7 +274,7 @@ TEST_P(CHROMIUMPathRenderingTest, TestPathParameter) ...@@ -274,7 +274,7 @@ TEST_P(CHROMIUMPathRenderingTest, TestPathParameter)
GLfloat f; GLfloat f;
glPathParameterfCHROMIUM(path, GL_PATH_END_CAPS_CHROMIUM, glPathParameterfCHROMIUM(path, GL_PATH_END_CAPS_CHROMIUM,
static_cast<GLenum>(kEndCaps[(i + 1) % 3])); static_cast<GLfloat>(kEndCaps[(i + 1) % 3]));
glGetPathParameterfvCHROMIUM(path, GL_PATH_END_CAPS_CHROMIUM, &f); glGetPathParameterfvCHROMIUM(path, GL_PATH_END_CAPS_CHROMIUM, &f);
ASSERT_GL_NO_ERROR(); ASSERT_GL_NO_ERROR();
EXPECT_EQ(kEndCaps[(i + 1) % 3], static_cast<GLenum>(f)); EXPECT_EQ(kEndCaps[(i + 1) % 3], static_cast<GLenum>(f));
...@@ -294,7 +294,7 @@ TEST_P(CHROMIUMPathRenderingTest, TestPathParameter) ...@@ -294,7 +294,7 @@ TEST_P(CHROMIUMPathRenderingTest, TestPathParameter)
GLfloat f; GLfloat f;
glPathParameterfCHROMIUM(path, GL_PATH_JOIN_STYLE_CHROMIUM, glPathParameterfCHROMIUM(path, GL_PATH_JOIN_STYLE_CHROMIUM,
static_cast<GLenum>(kJoinStyles[(i + 1) % 3])); static_cast<GLfloat>(kJoinStyles[(i + 1) % 3]));
ASSERT_GL_NO_ERROR(); ASSERT_GL_NO_ERROR();
glGetPathParameterfvCHROMIUM(path, GL_PATH_JOIN_STYLE_CHROMIUM, &f); glGetPathParameterfvCHROMIUM(path, GL_PATH_JOIN_STYLE_CHROMIUM, &f);
ASSERT_GL_NO_ERROR(); ASSERT_GL_NO_ERROR();
...@@ -604,32 +604,32 @@ class CHROMIUMPathRenderingDrawTest : public ANGLETest ...@@ -604,32 +604,32 @@ class CHROMIUMPathRenderingDrawTest : public ANGLETest
ASSERT_GL_NO_ERROR(); ASSERT_GL_NO_ERROR();
} }
void verifyTestPatternFill(float x, float y) void verifyTestPatternFill(GLint x, GLint y)
{ {
static const float kFillCoords[] = {55.0f, 54.0f, 50.0f, 28.0f, 66.0f, 63.0f}; 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};
for (size_t i = 0; i < 6; i += 2) for (size_t i = 0; i < 6; i += 2)
{ {
float fx = kFillCoords[i]; GLint fx = kFillCoords[i];
float fy = kFillCoords[i + 1]; GLint fy = kFillCoords[i + 1];
EXPECT_TRUE(CheckPixels(x + fx, y + fy, 1, 1, 0, kBlue)); EXPECT_TRUE(CheckPixels(x + fx, y + fy, 1, 1, 0, kBlue));
} }
} }
void verifyTestPatternBg(float x, float y) void verifyTestPatternBg(GLint x, GLint y)
{ {
static const float kBackgroundCoords[] = {80.0f, 80.0f, 20.0f, 20.0f, 90.0f, 1.0f}; 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};
for (size_t i = 0; i < 6; i += 2) for (size_t i = 0; i < 6; i += 2)
{ {
float bx = kBackgroundCoords[i]; GLint bx = kBackgroundCoords[i];
float by = kBackgroundCoords[i + 1]; GLint by = kBackgroundCoords[i + 1];
EXPECT_TRUE(CheckPixels(x + bx, y + by, 1, 1, 0, kExpectedColor)); EXPECT_TRUE(CheckPixels(x + bx, y + by, 1, 1, 0, kExpectedColor));
} }
} }
void verifyTestPatternStroke(float x, float y) void verifyTestPatternStroke(GLint x, GLint y)
{ {
// 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};
...@@ -689,9 +689,9 @@ TEST_P(CHROMIUMPathRenderingDrawTest, TestPathRendering) ...@@ -689,9 +689,9 @@ TEST_P(CHROMIUMPathRenderingDrawTest, TestPathRendering)
ASSERT_GL_NO_ERROR(); ASSERT_GL_NO_ERROR();
// Verify the image. // Verify the image.
verifyTestPatternFill(0.0f, 0.0f); verifyTestPatternFill(0, 0);
verifyTestPatternBg(0.0f, 0.0f); verifyTestPatternBg(0, 0);
verifyTestPatternStroke(0.0f, 0.0f); verifyTestPatternStroke(0, 0);
} }
// Test that StencilThen{Stroke,Fill} path rendering functions work // Test that StencilThen{Stroke,Fill} path rendering functions work
...@@ -723,9 +723,9 @@ TEST_P(CHROMIUMPathRenderingDrawTest, TestPathRenderingThenFunctions) ...@@ -723,9 +723,9 @@ TEST_P(CHROMIUMPathRenderingDrawTest, TestPathRenderingThenFunctions)
glDeletePathsCHROMIUM(path, 1); glDeletePathsCHROMIUM(path, 1);
// Verify the image. // Verify the image.
verifyTestPatternFill(0.0f, 0.0f); verifyTestPatternFill(0, 0);
verifyTestPatternBg(0.0f, 0.0f); verifyTestPatternBg(0, 0);
verifyTestPatternStroke(0.0f, 0.0f); verifyTestPatternStroke(0, 0);
} }
} // namespace } // namespace
......
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