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/gles2_cmd_decoder_unittest_framebuffers.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/gles2_cmd_decoder_unittest_framebuffers.cc')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc index 789b48a..78fa020 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc @@ -644,11 +644,10 @@ TEST_P(GLES2DecoderTest, ReadPixelsOutOfRange) { TEST_P(GLES2DecoderTest, ReadPixelsInvalidArgs) { typedef ReadPixels::Result Result; - Result* result = GetSharedMemoryAs<Result*>(); uint32 result_shm_id = kSharedMemoryId; uint32 result_shm_offset = kSharedMemoryOffset; uint32 pixels_shm_id = kSharedMemoryId; - uint32 pixels_shm_offset = kSharedMemoryOffset + sizeof(*result); + uint32 pixels_shm_offset = kSharedMemoryOffset + sizeof(Result); EXPECT_CALL(*gl_, ReadPixels(_, _, _, _, _, _, _)).Times(0); ReadPixels cmd; cmd.Init(0, @@ -750,14 +749,13 @@ TEST_P(GLES2DecoderManualInitTest, ReadPixelsAsyncError) { InitDecoder(init); typedef ReadPixels::Result Result; - Result* result = GetSharedMemoryAs<Result*>(); const GLsizei kWidth = 4; const GLsizei kHeight = 4; uint32 result_shm_id = kSharedMemoryId; uint32 result_shm_offset = kSharedMemoryOffset; uint32 pixels_shm_id = kSharedMemoryId; - uint32 pixels_shm_offset = kSharedMemoryOffset + sizeof(*result); + uint32 pixels_shm_offset = kSharedMemoryOffset + sizeof(Result); EXPECT_CALL(*gl_, GetError()) // first error check must pass to get to the test @@ -1637,11 +1635,10 @@ TEST_P(GLES2DecoderTest, ReadPixelsGLError) { GLsizei width = 2; GLsizei height = 4; typedef ReadPixels::Result Result; - Result* result = GetSharedMemoryAs<Result*>(); uint32 result_shm_id = kSharedMemoryId; uint32 result_shm_offset = kSharedMemoryOffset; uint32 pixels_shm_id = kSharedMemoryId; - uint32 pixels_shm_offset = kSharedMemoryOffset + sizeof(*result); + uint32 pixels_shm_offset = kSharedMemoryOffset + sizeof(Result); EXPECT_CALL(*gl_, GetError()) .WillOnce(Return(GL_NO_ERROR)) .WillOnce(Return(GL_OUT_OF_MEMORY)) @@ -1765,11 +1762,10 @@ TEST_P(GLES2DecoderWithShaderTest, UnClearedAttachmentsGetClearedOnReadPixels) { .Times(1) .RetiresOnSaturation(); typedef ReadPixels::Result Result; - Result* result = GetSharedMemoryAs<Result*>(); uint32 result_shm_id = kSharedMemoryId; uint32 result_shm_offset = kSharedMemoryOffset; uint32 pixels_shm_id = kSharedMemoryId; - uint32 pixels_shm_offset = kSharedMemoryOffset + sizeof(*result); + uint32 pixels_shm_offset = kSharedMemoryOffset + sizeof(Result); ReadPixels cmd; cmd.Init(0, 0, |