commit 493f95710ec112dae077aaf72d27e7455bff738d
author Jamie Madill <jmadill@chromium.org> Thu May 24 19:52:15 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Fri May 25 00:48:54 2018 +0000
tree f4f5036a01890ebf336dc9ef81a35392a84e5f50
parent b2eda420234df44ef5b347c1128385a612c35dd0

Add PrimitiveMode packed GLenum.

Bug: angleproject:2574
Change-Id: I3d7bd7ca0d69a364a611dc04799ea34906fc4a6c
Reviewed-on: https://chromium-review.googlesource.com/1067114
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>

src/libANGLE/TransformFeedback_unittest.cpp

diff --git a/src/libANGLE/TransformFeedback_unittest.cpp b/src/libANGLE/TransformFeedback_unittest.cpp
index 54f1086..5cb432b 100644
--- a/src/libANGLE/TransformFeedback_unittest.cpp
+++ b/src/libANGLE/TransformFeedback_unittest.cpp
@@ -6,6 +6,7 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+
 #include "libANGLE/Buffer.h"
 #include "libANGLE/Caps.h"
 #include "libANGLE/TransformFeedback.h"
@@ -61,8 +62,8 @@
     }
 
     rx::MockGLFactory mMockFactory;
-    rx::MockTransformFeedbackImpl* mImpl;
-    gl::TransformFeedback* mFeedback;
+    rx::MockTransformFeedbackImpl *mImpl;
+    gl::TransformFeedback *mFeedback;
     gl::Caps mCaps;
 };
 
@@ -71,10 +72,10 @@
     testing::InSequence seq;
 
     EXPECT_FALSE(mFeedback->isActive());
-    EXPECT_CALL(*mImpl, begin(GL_TRIANGLES));
-    mFeedback->begin(nullptr, GL_TRIANGLES, nullptr);
+    EXPECT_CALL(*mImpl, begin(gl::PrimitiveMode::Triangles));
+    mFeedback->begin(nullptr, gl::PrimitiveMode::Triangles, nullptr);
     EXPECT_TRUE(mFeedback->isActive());
-    EXPECT_EQ(static_cast<GLenum>(GL_TRIANGLES), mFeedback->getPrimitiveMode());
+    EXPECT_EQ(gl::PrimitiveMode::Triangles, mFeedback->getPrimitiveMode());
     EXPECT_CALL(*mImpl, end());
     mFeedback->end(nullptr);
     EXPECT_FALSE(mFeedback->isActive());
@@ -85,8 +86,8 @@
     testing::InSequence seq;
 
     EXPECT_FALSE(mFeedback->isActive());
-    EXPECT_CALL(*mImpl, begin(GL_TRIANGLES));
-    mFeedback->begin(nullptr, GL_TRIANGLES, nullptr);
+    EXPECT_CALL(*mImpl, begin(gl::PrimitiveMode::Triangles));
+    mFeedback->begin(nullptr, gl::PrimitiveMode::Triangles, nullptr);
     EXPECT_FALSE(mFeedback->isPaused());
     EXPECT_CALL(*mImpl, pause());
     mFeedback->pause();