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

Side by Side Diff: gpu/command_buffer/service/gpu_scheduler_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 4 years, 12 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h>
6 #include <stdint.h>
7
5 #include "gpu/command_buffer/common/command_buffer_mock.h" 8 #include "gpu/command_buffer/common/command_buffer_mock.h"
6 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 9 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
7 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" 10 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
8 #include "gpu/command_buffer/service/gpu_scheduler.h" 11 #include "gpu/command_buffer/service/gpu_scheduler.h"
9 #include "gpu/command_buffer/service/mocks.h" 12 #include "gpu/command_buffer/service/mocks.h"
10 #include "testing/gmock/include/gmock/gmock.h" 13 #include "testing/gmock/include/gmock/gmock.h"
11 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
12 15
13 using testing::_; 16 using testing::_;
14 using testing::DoAll; 17 using testing::DoAll;
15 using testing::Invoke; 18 using testing::Invoke;
16 using testing::NiceMock; 19 using testing::NiceMock;
17 using testing::Return; 20 using testing::Return;
18 using testing::SetArgumentPointee; 21 using testing::SetArgumentPointee;
19 using testing::StrictMock; 22 using testing::StrictMock;
20 23
21 namespace gpu { 24 namespace gpu {
22 25
23 const size_t kRingBufferSize = 1024; 26 const size_t kRingBufferSize = 1024;
24 27
25 class GpuSchedulerTest : public testing::Test { 28 class GpuSchedulerTest : public testing::Test {
26 protected: 29 protected:
27 static const int32 kTransferBufferId = 123; 30 static const int32_t kTransferBufferId = 123;
28 31
29 void SetUp() override { 32 void SetUp() override {
30 scoped_ptr<base::SharedMemory> shared_memory(new ::base::SharedMemory); 33 scoped_ptr<base::SharedMemory> shared_memory(new ::base::SharedMemory);
31 shared_memory->CreateAndMapAnonymous(kRingBufferSize); 34 shared_memory->CreateAndMapAnonymous(kRingBufferSize);
32 buffer_ = static_cast<int32*>(shared_memory->memory()); 35 buffer_ = static_cast<int32_t*>(shared_memory->memory());
33 shared_memory_buffer_ = 36 shared_memory_buffer_ =
34 MakeBufferFromSharedMemory(std::move(shared_memory), kRingBufferSize); 37 MakeBufferFromSharedMemory(std::move(shared_memory), kRingBufferSize);
35 memset(buffer_, 0, kRingBufferSize); 38 memset(buffer_, 0, kRingBufferSize);
36 39
37 command_buffer_.reset(new MockCommandBuffer); 40 command_buffer_.reset(new MockCommandBuffer);
38 41
39 CommandBuffer::State default_state; 42 CommandBuffer::State default_state;
40 ON_CALL(*command_buffer_.get(), GetLastState()) 43 ON_CALL(*command_buffer_.get(), GetLastState())
41 .WillByDefault(Return(default_state)); 44 .WillByDefault(Return(default_state));
42 ON_CALL(*command_buffer_.get(), GetPutOffset()) 45 ON_CALL(*command_buffer_.get(), GetPutOffset())
(...skipping 19 matching lines...) Expand all
62 // in order to fail the test. 65 // in order to fail the test.
63 base::MessageLoop::current()->RunUntilIdle(); 66 base::MessageLoop::current()->RunUntilIdle();
64 } 67 }
65 68
66 error::Error GetError() { 69 error::Error GetError() {
67 return command_buffer_->GetLastState().error; 70 return command_buffer_->GetLastState().error;
68 } 71 }
69 72
70 scoped_ptr<MockCommandBuffer> command_buffer_; 73 scoped_ptr<MockCommandBuffer> command_buffer_;
71 scoped_refptr<Buffer> shared_memory_buffer_; 74 scoped_refptr<Buffer> shared_memory_buffer_;
72 int32* buffer_; 75 int32_t* buffer_;
73 scoped_ptr<gles2::MockGLES2Decoder> decoder_; 76 scoped_ptr<gles2::MockGLES2Decoder> decoder_;
74 scoped_ptr<GpuScheduler> scheduler_; 77 scoped_ptr<GpuScheduler> scheduler_;
75 base::MessageLoop message_loop_; 78 base::MessageLoop message_loop_;
76 }; 79 };
77 80
78 TEST_F(GpuSchedulerTest, SchedulerDoesNothingIfRingBufferIsEmpty) { 81 TEST_F(GpuSchedulerTest, SchedulerDoesNothingIfRingBufferIsEmpty) {
79 CommandBuffer::State state; 82 CommandBuffer::State state;
80 83
81 EXPECT_CALL(*command_buffer_, GetLastState()) 84 EXPECT_CALL(*command_buffer_, GetLastState())
82 .WillRepeatedly(Return(state)); 85 .WillRepeatedly(Return(state));
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 209
207 EXPECT_EQ(kRingBufferSize, scheduler_->GetSharedMemoryBuffer(7)->size()); 210 EXPECT_EQ(kRingBufferSize, scheduler_->GetSharedMemoryBuffer(7)->size());
208 } 211 }
209 212
210 TEST_F(GpuSchedulerTest, SetTokenForwardsToCommandBuffer) { 213 TEST_F(GpuSchedulerTest, SetTokenForwardsToCommandBuffer) {
211 EXPECT_CALL(*command_buffer_, SetToken(7)); 214 EXPECT_CALL(*command_buffer_, SetToken(7));
212 scheduler_->set_token(7); 215 scheduler_->set_token(7);
213 } 216 }
214 217
215 } // namespace gpu 218 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gpu_scheduler.cc ('k') | gpu/command_buffer/service/gpu_state_tracer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698