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

Side by Side Diff: gpu/command_buffer/client/mapped_memory_unittest.cc

Issue 10441140: Make context groups share a TextureBufferManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 | Annotate | Revision Log
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 "gpu/command_buffer/client/mapped_memory.h" 5 #include "gpu/command_buffer/client/mapped_memory.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "gpu/command_buffer/client/cmd_buffer_helper.h" 9 #include "gpu/command_buffer/client/cmd_buffer_helper.h"
10 #include "gpu/command_buffer/service/mocks.h" 10 #include "gpu/command_buffer/service/mocks.h"
11 #include "gpu/command_buffer/service/command_buffer_service.h" 11 #include "gpu/command_buffer/service/command_buffer_service.h"
12 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
12 #include "gpu/command_buffer/service/gpu_scheduler.h" 13 #include "gpu/command_buffer/service/gpu_scheduler.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 15
15 #if defined(OS_MACOSX) 16 #if defined(OS_MACOSX)
16 #include "base/mac/scoped_nsautorelease_pool.h" 17 #include "base/mac/scoped_nsautorelease_pool.h"
17 #endif 18 #endif
18 19
19 namespace gpu { 20 namespace gpu {
20 21
21 using testing::Return; 22 using testing::Return;
(...skipping 12 matching lines...) Expand all
34 api_mock_.reset(new AsyncAPIMock); 35 api_mock_.reset(new AsyncAPIMock);
35 // ignore noops in the mock - we don't want to inspect the internals of the 36 // ignore noops in the mock - we don't want to inspect the internals of the
36 // helper. 37 // helper.
37 EXPECT_CALL(*api_mock_, DoCommand(cmd::kNoop, 0, _)) 38 EXPECT_CALL(*api_mock_, DoCommand(cmd::kNoop, 0, _))
38 .WillRepeatedly(Return(error::kNoError)); 39 .WillRepeatedly(Return(error::kNoError));
39 // Forward the SetToken calls to the engine 40 // Forward the SetToken calls to the engine
40 EXPECT_CALL(*api_mock_.get(), DoCommand(cmd::kSetToken, 1, _)) 41 EXPECT_CALL(*api_mock_.get(), DoCommand(cmd::kSetToken, 1, _))
41 .WillRepeatedly(DoAll(Invoke(api_mock_.get(), &AsyncAPIMock::SetToken), 42 .WillRepeatedly(DoAll(Invoke(api_mock_.get(), &AsyncAPIMock::SetToken),
42 Return(error::kNoError))); 43 Return(error::kNoError)));
43 44
44 command_buffer_.reset(new CommandBufferService); 45 {
45 command_buffer_->Initialize(); 46 TransferBufferManager* manager = new TransferBufferManager();
47 transfer_buffer_manager_.reset(manager);
48 EXPECT_TRUE(manager->Initialize());
49 }
50
51 command_buffer_.reset(
52 new CommandBufferService(transfer_buffer_manager_.get()));
53 EXPECT_TRUE(command_buffer_->Initialize());
46 54
47 gpu_scheduler_.reset(new GpuScheduler( 55 gpu_scheduler_.reset(new GpuScheduler(
48 command_buffer_.get(), api_mock_.get(), NULL)); 56 command_buffer_.get(), api_mock_.get(), NULL));
49 command_buffer_->SetPutOffsetChangeCallback(base::Bind( 57 command_buffer_->SetPutOffsetChangeCallback(base::Bind(
50 &GpuScheduler::PutChanged, base::Unretained(gpu_scheduler_.get()))); 58 &GpuScheduler::PutChanged, base::Unretained(gpu_scheduler_.get())));
51 command_buffer_->SetGetBufferChangeCallback(base::Bind( 59 command_buffer_->SetGetBufferChangeCallback(base::Bind(
52 &GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get()))); 60 &GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get())));
53 61
54 api_mock_->set_engine(gpu_scheduler_.get()); 62 api_mock_->set_engine(gpu_scheduler_.get());
55 63
56 helper_.reset(new CommandBufferHelper(command_buffer_.get())); 64 helper_.reset(new CommandBufferHelper(command_buffer_.get()));
57 helper_->Initialize(kBufferSize); 65 helper_->Initialize(kBufferSize);
58 } 66 }
59 67
60 int32 GetToken() { 68 int32 GetToken() {
61 return command_buffer_->GetState().token; 69 return command_buffer_->GetState().token;
62 } 70 }
63 71
64 #if defined(OS_MACOSX) 72 #if defined(OS_MACOSX)
65 base::mac::ScopedNSAutoreleasePool autorelease_pool_; 73 base::mac::ScopedNSAutoreleasePool autorelease_pool_;
66 #endif 74 #endif
67 MessageLoop message_loop_; 75 MessageLoop message_loop_;
68 scoped_ptr<AsyncAPIMock> api_mock_; 76 scoped_ptr<AsyncAPIMock> api_mock_;
77 scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_;
69 scoped_ptr<CommandBufferService> command_buffer_; 78 scoped_ptr<CommandBufferService> command_buffer_;
70 scoped_ptr<GpuScheduler> gpu_scheduler_; 79 scoped_ptr<GpuScheduler> gpu_scheduler_;
71 scoped_ptr<CommandBufferHelper> helper_; 80 scoped_ptr<CommandBufferHelper> helper_;
72 }; 81 };
73 82
74 #ifndef _MSC_VER 83 #ifndef _MSC_VER
75 const unsigned int MappedMemoryTestBase::kBufferSize; 84 const unsigned int MappedMemoryTestBase::kBufferSize;
76 #endif 85 #endif
77 86
78 // Test fixture for MemoryChunk test - Creates a MemoryChunk, using a 87 // Test fixture for MemoryChunk test - Creates a MemoryChunk, using a
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 ASSERT_TRUE(mem3); 299 ASSERT_TRUE(mem3);
291 EXPECT_NE(-1, id1); 300 EXPECT_NE(-1, id1);
292 EXPECT_EQ(id1, id2); 301 EXPECT_EQ(id1, id2);
293 EXPECT_NE(id2, id3); 302 EXPECT_NE(id2, id3);
294 EXPECT_EQ(0u, offset1); 303 EXPECT_EQ(0u, offset1);
295 EXPECT_EQ(kSize, offset2); 304 EXPECT_EQ(kSize, offset2);
296 EXPECT_EQ(0u, offset3); 305 EXPECT_EQ(0u, offset3);
297 } 306 }
298 307
299 } // namespace gpu 308 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698