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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: cc/output/gl_renderer_unittest.cc

Issue 634083002: gpu: Compositor management of GpuMemoryBuffer instances. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cc-pre-chromium-image-refactor
Patch Set: rebase Created 6 years, 2 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 | « cc/layers/tiled_layer_unittest.cc ('k') | cc/output/overlay_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "cc/output/gl_renderer.h" 5 #include "cc/output/gl_renderer.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "cc/base/math_util.h" 9 #include "cc/base/math_util.h"
10 #include "cc/output/compositor_frame_metadata.h" 10 #include "cc/output/compositor_frame_metadata.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 protected: 149 protected:
150 GLRendererWithDefaultHarnessTest() { 150 GLRendererWithDefaultHarnessTest() {
151 output_surface_ = 151 output_surface_ =
152 FakeOutputSurface::Create3d(TestWebGraphicsContext3D::Create()).Pass(); 152 FakeOutputSurface::Create3d(TestWebGraphicsContext3D::Create()).Pass();
153 CHECK(output_surface_->BindToClient(&output_surface_client_)); 153 CHECK(output_surface_->BindToClient(&output_surface_client_));
154 154
155 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); 155 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
156 resource_provider_ = ResourceProvider::Create(output_surface_.get(), 156 resource_provider_ = ResourceProvider::Create(output_surface_.get(),
157 shared_bitmap_manager_.get(), 157 shared_bitmap_manager_.get(),
158 NULL, 158 NULL,
159 NULL,
159 0, 160 0,
160 false, 161 false,
161 1, 162 1,
162 false).Pass(); 163 false).Pass();
163 renderer_ = make_scoped_ptr(new FakeRendererGL(&renderer_client_, 164 renderer_ = make_scoped_ptr(new FakeRendererGL(&renderer_client_,
164 &settings_, 165 &settings_,
165 output_surface_.get(), 166 output_surface_.get(),
166 resource_provider_.get())); 167 resource_provider_.get()));
167 } 168 }
168 169
(...skipping 16 matching lines...) Expand all
185 class GLRendererShaderTest : public GLRendererTest { 186 class GLRendererShaderTest : public GLRendererTest {
186 protected: 187 protected:
187 GLRendererShaderTest() { 188 GLRendererShaderTest() {
188 output_surface_ = FakeOutputSurface::Create3d().Pass(); 189 output_surface_ = FakeOutputSurface::Create3d().Pass();
189 CHECK(output_surface_->BindToClient(&output_surface_client_)); 190 CHECK(output_surface_->BindToClient(&output_surface_client_));
190 191
191 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); 192 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
192 resource_provider_ = ResourceProvider::Create(output_surface_.get(), 193 resource_provider_ = ResourceProvider::Create(output_surface_.get(),
193 shared_bitmap_manager_.get(), 194 shared_bitmap_manager_.get(),
194 NULL, 195 NULL,
196 NULL,
195 0, 197 0,
196 false, 198 false,
197 1, 199 1,
198 false).Pass(); 200 false).Pass();
199 renderer_.reset(new FakeRendererGL(&renderer_client_, 201 renderer_.reset(new FakeRendererGL(&renderer_client_,
200 &settings_, 202 &settings_,
201 output_surface_.get(), 203 output_surface_.get(),
202 resource_provider_.get())); 204 resource_provider_.get()));
203 } 205 }
204 206
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( 480 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d(
479 scoped_ptr<TestWebGraphicsContext3D>(new ForbidSynchronousCallContext))); 481 scoped_ptr<TestWebGraphicsContext3D>(new ForbidSynchronousCallContext)));
480 CHECK(output_surface->BindToClient(&output_surface_client)); 482 CHECK(output_surface->BindToClient(&output_surface_client));
481 483
482 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 484 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
483 new TestSharedBitmapManager()); 485 new TestSharedBitmapManager());
484 scoped_ptr<ResourceProvider> resource_provider( 486 scoped_ptr<ResourceProvider> resource_provider(
485 ResourceProvider::Create(output_surface.get(), 487 ResourceProvider::Create(output_surface.get(),
486 shared_bitmap_manager.get(), 488 shared_bitmap_manager.get(),
487 NULL, 489 NULL,
490 NULL,
488 0, 491 0,
489 false, 492 false,
490 1, 493 1,
491 false)); 494 false));
492 495
493 LayerTreeSettings settings; 496 LayerTreeSettings settings;
494 FakeRendererClient renderer_client; 497 FakeRendererClient renderer_client;
495 FakeRendererGL renderer(&renderer_client, 498 FakeRendererGL renderer(&renderer_client,
496 &settings, 499 &settings,
497 output_surface.get(), 500 output_surface.get(),
(...skipping 22 matching lines...) Expand all
520 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( 523 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d(
521 scoped_ptr<TestWebGraphicsContext3D>(new LoseContextOnFirstGetContext))); 524 scoped_ptr<TestWebGraphicsContext3D>(new LoseContextOnFirstGetContext)));
522 CHECK(output_surface->BindToClient(&output_surface_client)); 525 CHECK(output_surface->BindToClient(&output_surface_client));
523 526
524 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 527 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
525 new TestSharedBitmapManager()); 528 new TestSharedBitmapManager());
526 scoped_ptr<ResourceProvider> resource_provider( 529 scoped_ptr<ResourceProvider> resource_provider(
527 ResourceProvider::Create(output_surface.get(), 530 ResourceProvider::Create(output_surface.get(),
528 shared_bitmap_manager.get(), 531 shared_bitmap_manager.get(),
529 NULL, 532 NULL,
533 NULL,
530 0, 534 0,
531 false, 535 false,
532 1, 536 1,
533 false)); 537 false));
534 538
535 LayerTreeSettings settings; 539 LayerTreeSettings settings;
536 FakeRendererClient renderer_client; 540 FakeRendererClient renderer_client;
537 FakeRendererGL renderer(&renderer_client, 541 FakeRendererGL renderer(&renderer_client,
538 &settings, 542 &settings,
539 output_surface.get(), 543 output_surface.get(),
(...skipping 19 matching lines...) Expand all
559 scoped_ptr<OutputSurface> output_surface( 563 scoped_ptr<OutputSurface> output_surface(
560 FakeOutputSurface::Create3d(context_owned.Pass())); 564 FakeOutputSurface::Create3d(context_owned.Pass()));
561 CHECK(output_surface->BindToClient(&output_surface_client)); 565 CHECK(output_surface->BindToClient(&output_surface_client));
562 566
563 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 567 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
564 new TestSharedBitmapManager()); 568 new TestSharedBitmapManager());
565 scoped_ptr<ResourceProvider> resource_provider( 569 scoped_ptr<ResourceProvider> resource_provider(
566 ResourceProvider::Create(output_surface.get(), 570 ResourceProvider::Create(output_surface.get(),
567 shared_bitmap_manager.get(), 571 shared_bitmap_manager.get(),
568 NULL, 572 NULL,
573 NULL,
569 0, 574 0,
570 false, 575 false,
571 1, 576 1,
572 false)); 577 false));
573 578
574 LayerTreeSettings settings; 579 LayerTreeSettings settings;
575 FakeRendererClient renderer_client; 580 FakeRendererClient renderer_client;
576 FakeRendererGL renderer(&renderer_client, 581 FakeRendererGL renderer(&renderer_client,
577 &settings, 582 &settings,
578 output_surface.get(), 583 output_surface.get(),
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 scoped_ptr<OutputSurface> output_surface( 616 scoped_ptr<OutputSurface> output_surface(
612 FakeOutputSurface::Create3d(context_owned.Pass())); 617 FakeOutputSurface::Create3d(context_owned.Pass()));
613 CHECK(output_surface->BindToClient(&output_surface_client)); 618 CHECK(output_surface->BindToClient(&output_surface_client));
614 619
615 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 620 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
616 new TestSharedBitmapManager()); 621 new TestSharedBitmapManager());
617 scoped_ptr<ResourceProvider> resource_provider( 622 scoped_ptr<ResourceProvider> resource_provider(
618 ResourceProvider::Create(output_surface.get(), 623 ResourceProvider::Create(output_surface.get(),
619 shared_bitmap_manager.get(), 624 shared_bitmap_manager.get(),
620 NULL, 625 NULL,
626 NULL,
621 0, 627 0,
622 false, 628 false,
623 1, 629 1,
624 false)); 630 false));
625 631
626 LayerTreeSettings settings; 632 LayerTreeSettings settings;
627 FakeRendererClient renderer_client; 633 FakeRendererClient renderer_client;
628 FakeRendererGL renderer(&renderer_client, 634 FakeRendererGL renderer(&renderer_client,
629 &settings, 635 &settings,
630 output_surface.get(), 636 output_surface.get(),
(...skipping 25 matching lines...) Expand all
656 scoped_ptr<OutputSurface> output_surface( 662 scoped_ptr<OutputSurface> output_surface(
657 FakeOutputSurface::CreateOffscreen(context_owned.Pass())); 663 FakeOutputSurface::CreateOffscreen(context_owned.Pass()));
658 CHECK(output_surface->BindToClient(&output_surface_client)); 664 CHECK(output_surface->BindToClient(&output_surface_client));
659 665
660 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 666 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
661 new TestSharedBitmapManager()); 667 new TestSharedBitmapManager());
662 scoped_ptr<ResourceProvider> resource_provider( 668 scoped_ptr<ResourceProvider> resource_provider(
663 ResourceProvider::Create(output_surface.get(), 669 ResourceProvider::Create(output_surface.get(),
664 shared_bitmap_manager.get(), 670 shared_bitmap_manager.get(),
665 NULL, 671 NULL,
672 NULL,
666 0, 673 0,
667 false, 674 false,
668 1, 675 1,
669 false)); 676 false));
670 677
671 LayerTreeSettings settings; 678 LayerTreeSettings settings;
672 FakeRendererClient renderer_client; 679 FakeRendererClient renderer_client;
673 FakeRendererGL renderer(&renderer_client, 680 FakeRendererGL renderer(&renderer_client,
674 &settings, 681 &settings,
675 output_surface.get(), 682 output_surface.get(),
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 scoped_ptr<OutputSurface> output_surface( 750 scoped_ptr<OutputSurface> output_surface(
744 FakeOutputSurface::Create3d(provider)); 751 FakeOutputSurface::Create3d(provider));
745 CHECK(output_surface->BindToClient(&output_surface_client)); 752 CHECK(output_surface->BindToClient(&output_surface_client));
746 753
747 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 754 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
748 new TestSharedBitmapManager()); 755 new TestSharedBitmapManager());
749 scoped_ptr<ResourceProvider> resource_provider( 756 scoped_ptr<ResourceProvider> resource_provider(
750 ResourceProvider::Create(output_surface.get(), 757 ResourceProvider::Create(output_surface.get(),
751 shared_bitmap_manager.get(), 758 shared_bitmap_manager.get(),
752 NULL, 759 NULL,
760 NULL,
753 0, 761 0,
754 false, 762 false,
755 1, 763 1,
756 false)); 764 false));
757 765
758 LayerTreeSettings settings; 766 LayerTreeSettings settings;
759 FakeRendererClient renderer_client; 767 FakeRendererClient renderer_client;
760 FakeRendererGL renderer(&renderer_client, 768 FakeRendererGL renderer(&renderer_client,
761 &settings, 769 &settings,
762 output_surface.get(), 770 output_surface.get(),
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 scoped_ptr<OutputSurface> output_surface( 822 scoped_ptr<OutputSurface> output_surface(
815 FakeOutputSurface::Create3d(context_owned.Pass())); 823 FakeOutputSurface::Create3d(context_owned.Pass()));
816 CHECK(output_surface->BindToClient(&output_surface_client)); 824 CHECK(output_surface->BindToClient(&output_surface_client));
817 825
818 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 826 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
819 new TestSharedBitmapManager()); 827 new TestSharedBitmapManager());
820 scoped_ptr<ResourceProvider> resource_provider( 828 scoped_ptr<ResourceProvider> resource_provider(
821 ResourceProvider::Create(output_surface.get(), 829 ResourceProvider::Create(output_surface.get(),
822 shared_bitmap_manager.get(), 830 shared_bitmap_manager.get(),
823 NULL, 831 NULL,
832 NULL,
824 0, 833 0,
825 false, 834 false,
826 1, 835 1,
827 false)); 836 false));
828 837
829 LayerTreeSettings settings; 838 LayerTreeSettings settings;
830 FakeRendererClient renderer_client; 839 FakeRendererClient renderer_client;
831 FakeRendererGL renderer(&renderer_client, 840 FakeRendererGL renderer(&renderer_client,
832 &settings, 841 &settings,
833 output_surface.get(), 842 output_surface.get(),
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 scoped_ptr<OutputSurface> output_surface( 914 scoped_ptr<OutputSurface> output_surface(
906 FakeOutputSurface::Create3d(mock_context_owned.Pass())); 915 FakeOutputSurface::Create3d(mock_context_owned.Pass()));
907 CHECK(output_surface->BindToClient(&output_surface_client)); 916 CHECK(output_surface->BindToClient(&output_surface_client));
908 917
909 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 918 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
910 new TestSharedBitmapManager()); 919 new TestSharedBitmapManager());
911 scoped_ptr<ResourceProvider> resource_provider( 920 scoped_ptr<ResourceProvider> resource_provider(
912 ResourceProvider::Create(output_surface.get(), 921 ResourceProvider::Create(output_surface.get(),
913 shared_bitmap_manager.get(), 922 shared_bitmap_manager.get(),
914 NULL, 923 NULL,
924 NULL,
915 0, 925 0,
916 false, 926 false,
917 1, 927 1,
918 false)); 928 false));
919 929
920 LayerTreeSettings settings; 930 LayerTreeSettings settings;
921 settings.should_clear_root_render_pass = false; 931 settings.should_clear_root_render_pass = false;
922 932
923 FakeRendererClient renderer_client; 933 FakeRendererClient renderer_client;
924 FakeRendererGL renderer(&renderer_client, 934 FakeRendererGL renderer(&renderer_client,
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
1003 scoped_ptr<OutputSurface> output_surface( 1013 scoped_ptr<OutputSurface> output_surface(
1004 FakeOutputSurface::Create3d(context_owned.Pass())); 1014 FakeOutputSurface::Create3d(context_owned.Pass()));
1005 CHECK(output_surface->BindToClient(&output_surface_client)); 1015 CHECK(output_surface->BindToClient(&output_surface_client));
1006 1016
1007 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 1017 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
1008 new TestSharedBitmapManager()); 1018 new TestSharedBitmapManager());
1009 scoped_ptr<ResourceProvider> resource_provider( 1019 scoped_ptr<ResourceProvider> resource_provider(
1010 ResourceProvider::Create(output_surface.get(), 1020 ResourceProvider::Create(output_surface.get(),
1011 shared_bitmap_manager.get(), 1021 shared_bitmap_manager.get(),
1012 NULL, 1022 NULL,
1023 NULL,
1013 0, 1024 0,
1014 false, 1025 false,
1015 1, 1026 1,
1016 false)); 1027 false));
1017 1028
1018 LayerTreeSettings settings; 1029 LayerTreeSettings settings;
1019 FakeRendererClient renderer_client; 1030 FakeRendererClient renderer_client;
1020 FakeRendererGL renderer(&renderer_client, 1031 FakeRendererGL renderer(&renderer_client,
1021 &settings, 1032 &settings,
1022 output_surface.get(), 1033 output_surface.get(),
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 new NonReshapableOutputSurface(context_owned.Pass())); 1112 new NonReshapableOutputSurface(context_owned.Pass()));
1102 CHECK(output_surface->BindToClient(&output_surface_client)); 1113 CHECK(output_surface->BindToClient(&output_surface_client));
1103 output_surface->set_fixed_size(gfx::Size(100, 100)); 1114 output_surface->set_fixed_size(gfx::Size(100, 100));
1104 1115
1105 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 1116 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
1106 new TestSharedBitmapManager()); 1117 new TestSharedBitmapManager());
1107 scoped_ptr<ResourceProvider> resource_provider( 1118 scoped_ptr<ResourceProvider> resource_provider(
1108 ResourceProvider::Create(output_surface.get(), 1119 ResourceProvider::Create(output_surface.get(),
1109 shared_bitmap_manager.get(), 1120 shared_bitmap_manager.get(),
1110 NULL, 1121 NULL,
1122 NULL,
1111 0, 1123 0,
1112 false, 1124 false,
1113 1, 1125 1,
1114 false)); 1126 false));
1115 1127
1116 LayerTreeSettings settings; 1128 LayerTreeSettings settings;
1117 settings.partial_swap_enabled = true; 1129 settings.partial_swap_enabled = true;
1118 FakeRendererClient renderer_client; 1130 FakeRendererClient renderer_client;
1119 FakeRendererGL renderer(&renderer_client, 1131 FakeRendererGL renderer(&renderer_client,
1120 &settings, 1132 &settings,
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
1292 scoped_ptr<OutputSurface> output_surface( 1304 scoped_ptr<OutputSurface> output_surface(
1293 new NonReshapableOutputSurface(context_owned.Pass())); 1305 new NonReshapableOutputSurface(context_owned.Pass()));
1294 CHECK(output_surface->BindToClient(&output_surface_client)); 1306 CHECK(output_surface->BindToClient(&output_surface_client));
1295 1307
1296 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 1308 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
1297 new TestSharedBitmapManager()); 1309 new TestSharedBitmapManager());
1298 scoped_ptr<ResourceProvider> resource_provider( 1310 scoped_ptr<ResourceProvider> resource_provider(
1299 ResourceProvider::Create(output_surface.get(), 1311 ResourceProvider::Create(output_surface.get(),
1300 shared_bitmap_manager.get(), 1312 shared_bitmap_manager.get(),
1301 NULL, 1313 NULL,
1314 NULL,
1302 0, 1315 0,
1303 false, 1316 false,
1304 1, 1317 1,
1305 false)); 1318 false));
1306 1319
1307 LayerTreeSettings settings; 1320 LayerTreeSettings settings;
1308 FakeRendererClient renderer_client; 1321 FakeRendererClient renderer_client;
1309 FakeRendererGL renderer(&renderer_client, 1322 FakeRendererGL renderer(&renderer_client,
1310 &settings, 1323 &settings,
1311 output_surface.get(), 1324 output_surface.get(),
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
1671 class MockOutputSurfaceTest : public GLRendererTest { 1684 class MockOutputSurfaceTest : public GLRendererTest {
1672 protected: 1685 protected:
1673 virtual void SetUp() { 1686 virtual void SetUp() {
1674 FakeOutputSurfaceClient output_surface_client_; 1687 FakeOutputSurfaceClient output_surface_client_;
1675 CHECK(output_surface_.BindToClient(&output_surface_client_)); 1688 CHECK(output_surface_.BindToClient(&output_surface_client_));
1676 1689
1677 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); 1690 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
1678 resource_provider_ = ResourceProvider::Create(&output_surface_, 1691 resource_provider_ = ResourceProvider::Create(&output_surface_,
1679 shared_bitmap_manager_.get(), 1692 shared_bitmap_manager_.get(),
1680 NULL, 1693 NULL,
1694 NULL,
1681 0, 1695 0,
1682 false, 1696 false,
1683 1, 1697 1,
1684 false).Pass(); 1698 false).Pass();
1685 1699
1686 renderer_.reset(new FakeRendererGL(&renderer_client_, 1700 renderer_.reset(new FakeRendererGL(&renderer_client_,
1687 &settings_, 1701 &settings_,
1688 &output_surface_, 1702 &output_surface_,
1689 resource_provider_.get())); 1703 resource_provider_.get()));
1690 } 1704 }
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
1836 base::MessageLoop::current()->Run(); 1850 base::MessageLoop::current()->Run();
1837 1851
1838 // The sync point should have happened. 1852 // The sync point should have happened.
1839 EXPECT_EQ(1, sync_point_callback_count); 1853 EXPECT_EQ(1, sync_point_callback_count);
1840 EXPECT_EQ(1, other_callback_count); 1854 EXPECT_EQ(1, other_callback_count);
1841 } 1855 }
1842 #endif // OS_ANDROID 1856 #endif // OS_ANDROID
1843 1857
1844 } // namespace 1858 } // namespace
1845 } // namespace cc 1859 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/tiled_layer_unittest.cc ('k') | cc/output/overlay_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698