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

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

Issue 1025523005: gl_tests: Use zero size gl surface for offscreen rendering (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove unneeded ozone symbols and add gl init inside callback Created 5 years, 8 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"
11 #include "gpu/command_buffer/client/cmd_buffer_helper.h" 11 #include "gpu/command_buffer/client/cmd_buffer_helper.h"
12 #include "gpu/command_buffer/service/command_buffer_service.h" 12 #include "gpu/command_buffer/service/command_buffer_service.h"
13 #include "gpu/command_buffer/service/gpu_scheduler.h" 13 #include "gpu/command_buffer/service/gpu_scheduler.h"
14 #include "gpu/command_buffer/service/mocks.h" 14 #include "gpu/command_buffer/service/mocks.h"
15 #include "gpu/command_buffer/service/transfer_buffer_manager.h" 15 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 #if defined(OS_MACOSX)
19 #include "base/mac/scoped_nsautorelease_pool.h"
20 #endif
21
22 namespace gpu { 18 namespace gpu {
23 19
24 using testing::Return; 20 using testing::Return;
25 using testing::Mock; 21 using testing::Mock;
26 using testing::Truly; 22 using testing::Truly;
27 using testing::Sequence; 23 using testing::Sequence;
28 using testing::DoAll; 24 using testing::DoAll;
29 using testing::Invoke; 25 using testing::Invoke;
30 using testing::_; 26 using testing::_;
31 27
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 api_mock_->set_engine(gpu_scheduler_.get()); 60 api_mock_->set_engine(gpu_scheduler_.get());
65 61
66 helper_.reset(new CommandBufferHelper(command_buffer_.get())); 62 helper_.reset(new CommandBufferHelper(command_buffer_.get()));
67 helper_->Initialize(kBufferSize); 63 helper_->Initialize(kBufferSize);
68 } 64 }
69 65
70 int32 GetToken() { 66 int32 GetToken() {
71 return command_buffer_->GetLastState().token; 67 return command_buffer_->GetLastState().token;
72 } 68 }
73 69
74 #if defined(OS_MACOSX)
75 base::mac::ScopedNSAutoreleasePool autorelease_pool_;
76 #endif
77 base::MessageLoop message_loop_;
78 scoped_ptr<AsyncAPIMock> api_mock_; 70 scoped_ptr<AsyncAPIMock> api_mock_;
79 scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_; 71 scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_;
80 scoped_ptr<CommandBufferService> command_buffer_; 72 scoped_ptr<CommandBufferService> command_buffer_;
81 scoped_ptr<GpuScheduler> gpu_scheduler_; 73 scoped_ptr<GpuScheduler> gpu_scheduler_;
82 scoped_ptr<CommandBufferHelper> helper_; 74 scoped_ptr<CommandBufferHelper> helper_;
83 }; 75 };
84 76
85 #ifndef _MSC_VER 77 #ifndef _MSC_VER
86 const unsigned int MappedMemoryTestBase::kBufferSize; 78 const unsigned int MappedMemoryTestBase::kBufferSize;
87 #endif 79 #endif
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 unsigned int offset3; 439 unsigned int offset3;
448 void* mem3 = manager_->Alloc(kSize, &id3, &offset3); 440 void* mem3 = manager_->Alloc(kSize, &id3, &offset3);
449 EXPECT_EQ(manager_->bytes_in_use(), kSize * 2); 441 EXPECT_EQ(manager_->bytes_in_use(), kSize * 2);
450 442
451 manager_->Free(mem2); 443 manager_->Free(mem2);
452 manager_->Free(mem3); 444 manager_->Free(mem3);
453 EXPECT_EQ(manager_->bytes_in_use(), static_cast<size_t>(0)); 445 EXPECT_EQ(manager_->bytes_in_use(), static_cast<size_t>(0));
454 } 446 }
455 447
456 } // namespace gpu 448 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/client/fenced_allocator_test.cc ('k') | gpu/command_buffer/client/ring_buffer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698