diff options
author | Peter Kasting <pkasting@google.com> | 2014-11-20 15:14:08 -0800 |
---|---|---|
committer | Peter Kasting <pkasting@google.com> | 2014-11-20 23:16:57 +0000 |
commit | be940e9e152e528fc567c4eeeeb5930710873f98 (patch) | |
tree | 8496f9708b39b9ed106be20043e2e37d6ab58eb0 /gpu/command_buffer/service/buffer_manager_unittest.cc | |
parent | ce6760690b52af662b5684f24dca6edc20832edf (diff) | |
download | chromium_src-be940e9e152e528fc567c4eeeeb5930710873f98.zip chromium_src-be940e9e152e528fc567c4eeeeb5930710873f98.tar.gz chromium_src-be940e9e152e528fc567c4eeeeb5930710873f98.tar.bz2 |
Enable MSVC warning for unused locals.
There is seemingly a bug in the compiler where it occasionally claims a local is
unused when it isn't. This forces a few places to either inline such locals or
mark them ALLOW_UNUSED_LOCAL.
BUG=81439
TEST=none
R=brettw@chromium.org, cpu@chromium.org, jamesr@chromium.org, rvargas@chromium.org, sievers@chromium.org, sky@chromium.org, vitalybuka@chromium.org, wolenetz@chromium.org
Review URL: https://codereview.chromium.org/731373002
Cr-Commit-Position: refs/heads/master@{#305108}
Diffstat (limited to 'gpu/command_buffer/service/buffer_manager_unittest.cc')
-rw-r--r-- | gpu/command_buffer/service/buffer_manager_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gpu/command_buffer/service/buffer_manager_unittest.cc b/gpu/command_buffer/service/buffer_manager_unittest.cc index 5c24eb0..bef0089 100644 --- a/gpu/command_buffer/service/buffer_manager_unittest.cc +++ b/gpu/command_buffer/service/buffer_manager_unittest.cc @@ -210,21 +210,21 @@ TEST_F(BufferManagerTest, DoBufferSubData) { TEST_F(BufferManagerTest, GetRange) { const GLuint kClientBufferId = 1; const GLuint kServiceBufferId = 11; - const uint8 data[] = {10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; + const GLsizeiptr kDataSize = 10; manager_->CreateBuffer(kClientBufferId, kServiceBufferId); Buffer* buffer = manager_->GetBuffer(kClientBufferId); ASSERT_TRUE(buffer != NULL); manager_->SetTarget(buffer, GL_ELEMENT_ARRAY_BUFFER); - DoBufferData(buffer, sizeof(data), GL_STATIC_DRAW, NULL, GL_NO_ERROR); + DoBufferData(buffer, kDataSize, GL_STATIC_DRAW, NULL, GL_NO_ERROR); const char* buf = - static_cast<const char*>(buffer->GetRange(0, sizeof(data))); + static_cast<const char*>(buffer->GetRange(0, kDataSize)); ASSERT_TRUE(buf != NULL); const char* buf1 = - static_cast<const char*>(buffer->GetRange(1, sizeof(data) - 1)); + static_cast<const char*>(buffer->GetRange(1, kDataSize - 1)); EXPECT_EQ(buf + 1, buf1); - EXPECT_TRUE(buffer->GetRange(sizeof(data), 1) == NULL); - EXPECT_TRUE(buffer->GetRange(0, sizeof(data) + 1) == NULL); - EXPECT_TRUE(buffer->GetRange(-1, sizeof(data)) == NULL); + EXPECT_TRUE(buffer->GetRange(kDataSize, 1) == NULL); + EXPECT_TRUE(buffer->GetRange(0, kDataSize + 1) == NULL); + EXPECT_TRUE(buffer->GetRange(-1, kDataSize) == NULL); EXPECT_TRUE(buffer->GetRange(-0, -1) == NULL); const int size = 0x20000; DoBufferData(buffer, size / 2, GL_STATIC_DRAW, NULL, GL_NO_ERROR); @@ -350,7 +350,7 @@ TEST_F(BufferManagerTest, GetMaxValueForRangeUint32) { TEST_F(BufferManagerTest, UseDeletedBuffer) { const GLuint kClientBufferId = 1; const GLuint kServiceBufferId = 11; - const uint32 data[] = {10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; + const GLsizeiptr kDataSize = 10; manager_->CreateBuffer(kClientBufferId, kServiceBufferId); scoped_refptr<Buffer> buffer = manager_->GetBuffer(kClientBufferId); ASSERT_TRUE(buffer.get() != NULL); @@ -358,7 +358,7 @@ TEST_F(BufferManagerTest, UseDeletedBuffer) { // Remove buffer manager_->RemoveBuffer(kClientBufferId); // Use it after removing - DoBufferData(buffer.get(), sizeof(data), GL_STATIC_DRAW, NULL, GL_NO_ERROR); + DoBufferData(buffer.get(), kDataSize, GL_STATIC_DRAW, NULL, GL_NO_ERROR); // Check that it gets deleted when the last reference is released. EXPECT_CALL(*gl_, DeleteBuffersARB(1, ::testing::Pointee(kServiceBufferId))) .Times(1) |