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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc

Issue 1281043006: Move NumberOfPlanesForGpuMemoryBufferFormat to gfx (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build warning again Created 5 years, 4 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
« no previous file with comments | « content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc ('k') | gpu/command_buffer/tests/gl_manager.cc » ('j') | ui/gfx/gpu_memory_buffer.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/common/gpu/client/gpu_memory_buffer_impl.h" 5 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/common/gpu/gpu_memory_buffer_factory.h" 8 #include "content/common/gpu/gpu_memory_buffer_factory.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 GpuMemoryBufferImpl::CreateFromHandle( 85 GpuMemoryBufferImpl::CreateFromHandle(
86 CreateGpuMemoryBuffer(kBufferId, buffer_size, configuration.format, 86 CreateGpuMemoryBuffer(kBufferId, buffer_size, configuration.format,
87 configuration.usage), 87 configuration.usage),
88 buffer_size, configuration.format, configuration.usage, 88 buffer_size, configuration.format, configuration.usage,
89 base::Bind(&GpuMemoryBufferImplTest::DestroyGpuMemoryBuffer, 89 base::Bind(&GpuMemoryBufferImplTest::DestroyGpuMemoryBuffer,
90 base::Unretained(this), kBufferId))); 90 base::Unretained(this), kBufferId)));
91 ASSERT_TRUE(buffer); 91 ASSERT_TRUE(buffer);
92 EXPECT_FALSE(buffer->IsMapped()); 92 EXPECT_FALSE(buffer->IsMapped());
93 93
94 size_t num_planes = 94 size_t num_planes =
95 GpuMemoryBufferImpl::NumberOfPlanesForGpuMemoryBufferFormat( 95 gfx::GpuMemoryBuffer::NumberOfPlanes(configuration.format);
96 configuration.format);
97 96
98 // Map buffer into user space. 97 // Map buffer into user space.
99 scoped_ptr<void*[]> mapped_buffers(new void*[num_planes]); 98 scoped_ptr<void*[]> mapped_buffers(new void*[num_planes]);
100 bool rv = buffer->Map(mapped_buffers.get()); 99 bool rv = buffer->Map(mapped_buffers.get());
101 ASSERT_TRUE(rv); 100 ASSERT_TRUE(rv);
102 EXPECT_TRUE(buffer->IsMapped()); 101 EXPECT_TRUE(buffer->IsMapped());
103 102
104 // Get strides. 103 // Get strides.
105 scoped_ptr<int[]> strides(new int[num_planes]); 104 scoped_ptr<int[]> strides(new int[num_planes]);
106 buffer->GetStride(strides.get()); 105 buffer->GetStride(strides.get());
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 GpuMemoryBufferImpl::CreateFromHandle( 147 GpuMemoryBufferImpl::CreateFromHandle(
149 CreateGpuMemoryBuffer(kBufferId, buffer_size, configuration.format, 148 CreateGpuMemoryBuffer(kBufferId, buffer_size, configuration.format,
150 configuration.usage), 149 configuration.usage),
151 buffer_size, configuration.format, configuration.usage, 150 buffer_size, configuration.format, configuration.usage,
152 base::Bind(&GpuMemoryBufferImplTest::DestroyGpuMemoryBuffer, 151 base::Bind(&GpuMemoryBufferImplTest::DestroyGpuMemoryBuffer,
153 base::Unretained(this), kBufferId))); 152 base::Unretained(this), kBufferId)));
154 ASSERT_TRUE(buffer); 153 ASSERT_TRUE(buffer);
155 EXPECT_FALSE(buffer->IsMapped()); 154 EXPECT_FALSE(buffer->IsMapped());
156 155
157 size_t num_planes = 156 size_t num_planes =
158 GpuMemoryBufferImpl::NumberOfPlanesForGpuMemoryBufferFormat( 157 gfx::GpuMemoryBuffer::NumberOfPlanes(configuration.format);
159 configuration.format);
160 158
161 // Map buffer into user space. 159 // Map buffer into user space.
162 scoped_ptr<void* []> mapped_buffers(new void* [num_planes]); 160 scoped_ptr<void* []> mapped_buffers(new void* [num_planes]);
163 bool rv = buffer->Map(mapped_buffers.get()); 161 bool rv = buffer->Map(mapped_buffers.get());
164 ASSERT_TRUE(rv); 162 ASSERT_TRUE(rv);
165 EXPECT_TRUE(buffer->IsMapped()); 163 EXPECT_TRUE(buffer->IsMapped());
166 164
167 // Get strides. 165 // Get strides.
168 scoped_ptr<int[]> strides(new int[num_planes]); 166 scoped_ptr<int[]> strides(new int[num_planes]);
169 buffer->GetStride(strides.get()); 167 buffer->GetStride(strides.get());
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 return supported_types; 230 return supported_types;
233 } 231 }
234 232
235 INSTANTIATE_TEST_CASE_P( 233 INSTANTIATE_TEST_CASE_P(
236 GpuMemoryBufferImplTests, 234 GpuMemoryBufferImplTests,
237 GpuMemoryBufferImplTest, 235 GpuMemoryBufferImplTest,
238 ::testing::ValuesIn(GetSupportedGpuMemoryBufferTypes())); 236 ::testing::ValuesIn(GetSupportedGpuMemoryBufferTypes()));
239 237
240 } // namespace 238 } // namespace
241 } // namespace content 239 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc ('k') | gpu/command_buffer/tests/gl_manager.cc » ('j') | ui/gfx/gpu_memory_buffer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698