Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(425)

Unified Diff: gpu/command_buffer/service/vertex_attrib_manager_unittest.cc

Issue 1542513002: Switch to standard integer types in gpu/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
diff --git a/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc b/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
index 9c521949dedd3ce6e67ee85357d03af9e0a1fc84..2e31c16254a0db5ba001abb829cf39302baeb525 100644
--- a/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
+++ b/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
@@ -4,6 +4,8 @@
#include "gpu/command_buffer/service/vertex_attrib_manager.h"
+#include <stdint.h>
+
#include "base/memory/scoped_ptr.h"
#include "gpu/command_buffer/service/buffer_manager.h"
#include "gpu/command_buffer/service/error_state_mock.h"
@@ -21,7 +23,7 @@ namespace gles2 {
class VertexAttribManagerTest : public GpuServiceTest {
public:
- static const uint32 kNumVertexAttribs = 8;
+ static const uint32_t kNumVertexAttribs = 8;
VertexAttribManagerTest() {
}
@@ -32,7 +34,7 @@ class VertexAttribManagerTest : public GpuServiceTest {
void SetUp() override {
GpuServiceTest::SetUp();
- for (uint32 ii = 0; ii < kNumVertexAttribs; ++ii) {
+ for (uint32_t ii = 0; ii < kNumVertexAttribs; ++ii) {
EXPECT_CALL(*gl_, VertexAttrib4f(ii, 0.0f, 0.0f, 0.0f, 1.0f))
.Times(1)
.RetiresOnSaturation();
@@ -47,7 +49,7 @@ class VertexAttribManagerTest : public GpuServiceTest {
// GCC requires these declarations, but MSVC requires they not be present
#ifndef COMPILER_MSVC
-const uint32 VertexAttribManagerTest::kNumVertexAttribs;
+const uint32_t VertexAttribManagerTest::kNumVertexAttribs;
#endif
TEST_F(VertexAttribManagerTest, Basic) {
@@ -58,7 +60,7 @@ TEST_F(VertexAttribManagerTest, Basic) {
manager_->GetEnabledVertexAttribs();
EXPECT_EQ(0u, enabled_attribs.size());
- for (uint32 ii = 0; ii < kNumVertexAttribs; ii += kNumVertexAttribs - 1) {
+ for (uint32_t ii = 0; ii < kNumVertexAttribs; ii += kNumVertexAttribs - 1) {
VertexAttrib* attrib = manager_->GetVertexAttrib(ii);
ASSERT_TRUE(attrib != NULL);
EXPECT_EQ(ii, attrib->index());
« no previous file with comments | « gpu/command_buffer/service/vertex_attrib_manager.cc ('k') | gpu/command_buffer/tests/compressed_texture_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698