Commit e0a2d1c5 by Kenneth Russell

Add needed static_casts to GLenum for compilation on Linux.

BUG=angleproject:773 Change-Id: I8b01a1f187456eb8997fc7a620b5ecdffb872c19 Reviewed-on: https://chromium-review.googlesource.com/221810Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarKenneth Russell <kbr@chromium.org>
parent 9aca059f
...@@ -31,7 +31,7 @@ TEST(ImageIndexTest, Iterator2D) ...@@ -31,7 +31,7 @@ TEST(ImageIndexTest, Iterator2D)
ImageIndex current = iter.current(); ImageIndex current = iter.current();
ImageIndex nextIndex = iter.next(); ImageIndex nextIndex = iter.next();
EXPECT_EQ(GL_TEXTURE_2D, nextIndex.type); EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_2D), nextIndex.type);
EXPECT_EQ(mip, nextIndex.mipIndex); EXPECT_EQ(mip, nextIndex.mipIndex);
EXPECT_FALSE(nextIndex.hasLayer()); EXPECT_FALSE(nextIndex.hasLayer());
...@@ -78,7 +78,7 @@ TEST(ImageIndexTest, Iterator3D) ...@@ -78,7 +78,7 @@ TEST(ImageIndexTest, Iterator3D)
EXPECT_TRUE(iter.hasNext()); EXPECT_TRUE(iter.hasNext());
ImageIndex nextIndex = iter.next(); ImageIndex nextIndex = iter.next();
EXPECT_EQ(GL_TEXTURE_3D, nextIndex.type); EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_3D), nextIndex.type);
EXPECT_EQ(mip, nextIndex.mipIndex); EXPECT_EQ(mip, nextIndex.mipIndex);
EXPECT_EQ(layer, nextIndex.layerIndex); EXPECT_EQ(layer, nextIndex.layerIndex);
EXPECT_TRUE(nextIndex.hasLayer()); EXPECT_TRUE(nextIndex.hasLayer());
...@@ -102,7 +102,7 @@ TEST(ImageIndexTest, Iterator2DArray) ...@@ -102,7 +102,7 @@ TEST(ImageIndexTest, Iterator2DArray)
EXPECT_TRUE(iter.hasNext()); EXPECT_TRUE(iter.hasNext());
ImageIndex nextIndex = iter.next(); ImageIndex nextIndex = iter.next();
EXPECT_EQ(GL_TEXTURE_2D_ARRAY, nextIndex.type); EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_2D_ARRAY), nextIndex.type);
EXPECT_EQ(mip, nextIndex.mipIndex); EXPECT_EQ(mip, nextIndex.mipIndex);
EXPECT_EQ(layer, nextIndex.layerIndex); EXPECT_EQ(layer, nextIndex.layerIndex);
EXPECT_TRUE(nextIndex.hasLayer()); EXPECT_TRUE(nextIndex.hasLayer());
......
...@@ -67,7 +67,7 @@ TEST_F(TransformFeedbackTest, SideEffectsOfStartAndStop) ...@@ -67,7 +67,7 @@ TEST_F(TransformFeedbackTest, SideEffectsOfStartAndStop)
EXPECT_CALL(*mImpl, begin(GL_TRIANGLES)); EXPECT_CALL(*mImpl, begin(GL_TRIANGLES));
mFeedback->start(GL_TRIANGLES); mFeedback->start(GL_TRIANGLES);
EXPECT_EQ(GL_TRUE, mFeedback->isStarted()); EXPECT_EQ(GL_TRUE, mFeedback->isStarted());
EXPECT_EQ(GL_TRIANGLES, mFeedback->getDrawMode()); EXPECT_EQ(static_cast<GLenum>(GL_TRIANGLES), mFeedback->getDrawMode());
EXPECT_CALL(*mImpl, end()); EXPECT_CALL(*mImpl, end());
mFeedback->stop(); mFeedback->stop();
EXPECT_EQ(GL_FALSE, mFeedback->isStarted()); EXPECT_EQ(GL_FALSE, mFeedback->isStarted());
......
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