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

Side by Side Diff: gpu/command_buffer/service/buffer_manager_unittest.cc

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo part of clang-format Created 4 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
no sievers 2016/04/05 19:02:40 #include <memory>
Mostyn Bramley-Moore 2016/04/05 21:35:31 Done.
8 #include "gpu/command_buffer/service/buffer_manager.h" 8 #include "gpu/command_buffer/service/buffer_manager.h"
9 #include "gpu/command_buffer/service/error_state_mock.h" 9 #include "gpu/command_buffer/service/error_state_mock.h"
10 #include "gpu/command_buffer/service/feature_info.h" 10 #include "gpu/command_buffer/service/feature_info.h"
11 #include "gpu/command_buffer/service/gpu_service_test.h" 11 #include "gpu/command_buffer/service/gpu_service_test.h"
12 #include "gpu/command_buffer/service/mocks.h" 12 #include "gpu/command_buffer/service/mocks.h"
13 #include "gpu/command_buffer/service/test_helper.h" 13 #include "gpu/command_buffer/service/test_helper.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/gl/gl_mock.h" 15 #include "ui/gl/gl_mock.h"
16 16
17 using ::testing::_; 17 using ::testing::_;
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 EXPECT_TRUE(buffer->GetMaxValueForRange( 219 EXPECT_TRUE(buffer->GetMaxValueForRange(
220 0, 10, GL_UNSIGNED_INT, enable_primitive_restart, &max_value)); 220 0, 10, GL_UNSIGNED_INT, enable_primitive_restart, &max_value));
221 EXPECT_EQ(120u, max_value); 221 EXPECT_EQ(120u, max_value);
222 // Check out of range fails. 222 // Check out of range fails.
223 EXPECT_FALSE(buffer->GetMaxValueForRange( 223 EXPECT_FALSE(buffer->GetMaxValueForRange(
224 0, 11, GL_UNSIGNED_INT, enable_primitive_restart, &max_value)); 224 0, 11, GL_UNSIGNED_INT, enable_primitive_restart, &max_value));
225 EXPECT_FALSE(buffer->GetMaxValueForRange( 225 EXPECT_FALSE(buffer->GetMaxValueForRange(
226 40, 1, GL_UNSIGNED_INT, enable_primitive_restart, &max_value)); 226 40, 1, GL_UNSIGNED_INT, enable_primitive_restart, &max_value));
227 } 227 }
228 228
229 scoped_ptr<BufferManager> manager_; 229 std::unique_ptr<BufferManager> manager_;
230 scoped_ptr<MockErrorState> error_state_; 230 std::unique_ptr<MockErrorState> error_state_;
231 }; 231 };
232 232
233 class BufferManagerTest : public BufferManagerTestBase { 233 class BufferManagerTest : public BufferManagerTestBase {
234 protected: 234 protected:
235 void SetUp() override { SetUpBase(NULL, NULL, ""); } 235 void SetUp() override { SetUpBase(NULL, NULL, ""); }
236 }; 236 };
237 237
238 class BufferManagerMemoryTrackerTest : public BufferManagerTestBase { 238 class BufferManagerMemoryTrackerTest : public BufferManagerTestBase {
239 protected: 239 protected:
240 void SetUp() override { 240 void SetUp() override {
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 DoBufferData( 356 DoBufferData(
357 buffer, kTarget, sizeof(data), GL_STATIC_DRAW, NULL, GL_NO_ERROR); 357 buffer, kTarget, sizeof(data), GL_STATIC_DRAW, NULL, GL_NO_ERROR);
358 EXPECT_TRUE(DoBufferSubData(buffer, kTarget, 0, sizeof(data), data)); 358 EXPECT_TRUE(DoBufferSubData(buffer, kTarget, 0, sizeof(data), data));
359 EXPECT_TRUE(DoBufferSubData(buffer, kTarget, sizeof(data), 0, data)); 359 EXPECT_TRUE(DoBufferSubData(buffer, kTarget, sizeof(data), 0, data));
360 EXPECT_FALSE(DoBufferSubData(buffer, kTarget, sizeof(data), 1, data)); 360 EXPECT_FALSE(DoBufferSubData(buffer, kTarget, sizeof(data), 1, data));
361 EXPECT_FALSE(DoBufferSubData(buffer, kTarget, 0, sizeof(data) + 1, data)); 361 EXPECT_FALSE(DoBufferSubData(buffer, kTarget, 0, sizeof(data) + 1, data));
362 EXPECT_FALSE(DoBufferSubData(buffer, kTarget, -1, sizeof(data), data)); 362 EXPECT_FALSE(DoBufferSubData(buffer, kTarget, -1, sizeof(data), data));
363 EXPECT_FALSE(DoBufferSubData(buffer, kTarget, 0, -1, data)); 363 EXPECT_FALSE(DoBufferSubData(buffer, kTarget, 0, -1, data));
364 DoBufferData(buffer, kTarget, 1, GL_STATIC_DRAW, NULL, GL_NO_ERROR); 364 DoBufferData(buffer, kTarget, 1, GL_STATIC_DRAW, NULL, GL_NO_ERROR);
365 const int size = 0x20000; 365 const int size = 0x20000;
366 scoped_ptr<uint8_t[]> temp(new uint8_t[size]); 366 std::unique_ptr<uint8_t[]> temp(new uint8_t[size]);
367 EXPECT_FALSE(DoBufferSubData(buffer, kTarget, 0 - size, size, temp.get())); 367 EXPECT_FALSE(DoBufferSubData(buffer, kTarget, 0 - size, size, temp.get()));
368 EXPECT_FALSE(DoBufferSubData(buffer, kTarget, 1, size / 2, temp.get())); 368 EXPECT_FALSE(DoBufferSubData(buffer, kTarget, 1, size / 2, temp.get()));
369 } 369 }
370 370
371 TEST_F(BufferManagerTest, GetRange) { 371 TEST_F(BufferManagerTest, GetRange) {
372 const GLenum kTarget = GL_ELEMENT_ARRAY_BUFFER; 372 const GLenum kTarget = GL_ELEMENT_ARRAY_BUFFER;
373 const GLuint kClientBufferId = 1; 373 const GLuint kClientBufferId = 1;
374 const GLuint kServiceBufferId = 11; 374 const GLuint kServiceBufferId = 11;
375 const GLsizeiptr kDataSize = 10; 375 const GLsizeiptr kDataSize = 10;
376 manager_->CreateBuffer(kClientBufferId, kServiceBufferId); 376 manager_->CreateBuffer(kClientBufferId, kServiceBufferId);
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 EXPECT_TRUE(manager_->SetTarget(buffer, kTargets[jj])); 566 EXPECT_TRUE(manager_->SetTarget(buffer, kTargets[jj]));
567 } 567 }
568 } 568 }
569 } 569 }
570 } 570 }
571 571
572 } // namespace gles2 572 } // namespace gles2
573 } // namespace gpu 573 } // namespace gpu
574 574
575 575
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698