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

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

Issue 1345813002: Added a unique command buffer ID for command buffers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed copyright Created 5 years, 3 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 6
7 #include <list> 7 #include <list>
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 29 matching lines...) Expand all
40 .WillRepeatedly(DoAll(Invoke(api_mock_.get(), &AsyncAPIMock::SetToken), 40 .WillRepeatedly(DoAll(Invoke(api_mock_.get(), &AsyncAPIMock::SetToken),
41 Return(error::kNoError))); 41 Return(error::kNoError)));
42 42
43 { 43 {
44 TransferBufferManager* manager = new TransferBufferManager(nullptr); 44 TransferBufferManager* manager = new TransferBufferManager(nullptr);
45 transfer_buffer_manager_ = manager; 45 transfer_buffer_manager_ = manager;
46 EXPECT_TRUE(manager->Initialize()); 46 EXPECT_TRUE(manager->Initialize());
47 } 47 }
48 48
49 command_buffer_.reset( 49 command_buffer_.reset(
50 new CommandBufferService(transfer_buffer_manager_.get())); 50 new CommandBufferService(transfer_buffer_manager_.get(),
51 kCommandBufferNamespace_InProcess,
52 0));
51 EXPECT_TRUE(command_buffer_->Initialize()); 53 EXPECT_TRUE(command_buffer_->Initialize());
52 54
53 gpu_scheduler_.reset(new GpuScheduler( 55 gpu_scheduler_.reset(new GpuScheduler(
54 command_buffer_.get(), api_mock_.get(), NULL)); 56 command_buffer_.get(), api_mock_.get(), NULL));
55 command_buffer_->SetPutOffsetChangeCallback(base::Bind( 57 command_buffer_->SetPutOffsetChangeCallback(base::Bind(
56 &GpuScheduler::PutChanged, base::Unretained(gpu_scheduler_.get()))); 58 &GpuScheduler::PutChanged, base::Unretained(gpu_scheduler_.get())));
57 command_buffer_->SetGetBufferChangeCallback(base::Bind( 59 command_buffer_->SetGetBufferChangeCallback(base::Bind(
58 &GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get()))); 60 &GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get())));
59 61
60 api_mock_->set_engine(gpu_scheduler_.get()); 62 api_mock_->set_engine(gpu_scheduler_.get());
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 void* mem4 = manager_->Alloc(kLimit, &id4, &offset4); 427 void* mem4 = manager_->Alloc(kLimit, &id4, &offset4);
426 ASSERT_TRUE(mem4); 428 ASSERT_TRUE(mem4);
427 EXPECT_EQ(id2, id4); 429 EXPECT_EQ(id2, id4);
428 EXPECT_EQ(offset2, offset4); 430 EXPECT_EQ(offset2, offset4);
429 431
430 manager_->Free(mem1); 432 manager_->Free(mem1);
431 manager_->Free(mem4); 433 manager_->Free(mem4);
432 } 434 }
433 435
434 } // namespace gpu 436 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698