OLD | NEW |
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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 class GLRendererWithDefaultHarnessTest : public GLRendererTest { | 151 class GLRendererWithDefaultHarnessTest : public GLRendererTest { |
152 protected: | 152 protected: |
153 GLRendererWithDefaultHarnessTest() { | 153 GLRendererWithDefaultHarnessTest() { |
154 output_surface_ = | 154 output_surface_ = |
155 FakeOutputSurface::Create3d(TestWebGraphicsContext3D::Create()).Pass(); | 155 FakeOutputSurface::Create3d(TestWebGraphicsContext3D::Create()).Pass(); |
156 CHECK(output_surface_->BindToClient(&output_surface_client_)); | 156 CHECK(output_surface_->BindToClient(&output_surface_client_)); |
157 | 157 |
158 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 158 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
159 resource_provider_ = | 159 resource_provider_ = |
160 ResourceProvider::Create( | 160 ResourceProvider::Create( |
161 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1) | 161 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1, |
162 .Pass(); | 162 false).Pass(); |
163 renderer_ = make_scoped_ptr(new FakeRendererGL(&renderer_client_, | 163 renderer_ = make_scoped_ptr(new FakeRendererGL(&renderer_client_, |
164 &settings_, | 164 &settings_, |
165 output_surface_.get(), | 165 output_surface_.get(), |
166 resource_provider_.get())); | 166 resource_provider_.get())); |
167 } | 167 } |
168 | 168 |
169 void SwapBuffers() { renderer_->SwapBuffers(CompositorFrameMetadata()); } | 169 void SwapBuffers() { renderer_->SwapBuffers(CompositorFrameMetadata()); } |
170 | 170 |
171 LayerTreeSettings settings_; | 171 LayerTreeSettings settings_; |
172 FakeOutputSurfaceClient output_surface_client_; | 172 FakeOutputSurfaceClient output_surface_client_; |
(...skipping 11 matching lines...) Expand all Loading... |
184 | 184 |
185 class GLRendererShaderTest : public GLRendererTest { | 185 class GLRendererShaderTest : public GLRendererTest { |
186 protected: | 186 protected: |
187 GLRendererShaderTest() { | 187 GLRendererShaderTest() { |
188 output_surface_ = FakeOutputSurface::Create3d().Pass(); | 188 output_surface_ = FakeOutputSurface::Create3d().Pass(); |
189 CHECK(output_surface_->BindToClient(&output_surface_client_)); | 189 CHECK(output_surface_->BindToClient(&output_surface_client_)); |
190 | 190 |
191 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 191 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
192 resource_provider_ = | 192 resource_provider_ = |
193 ResourceProvider::Create( | 193 ResourceProvider::Create( |
194 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1) | 194 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1, |
195 .Pass(); | 195 false).Pass(); |
196 renderer_.reset(new FakeRendererGL(&renderer_client_, | 196 renderer_.reset(new FakeRendererGL(&renderer_client_, |
197 &settings_, | 197 &settings_, |
198 output_surface_.get(), | 198 output_surface_.get(), |
199 resource_provider_.get())); | 199 resource_provider_.get())); |
200 } | 200 } |
201 | 201 |
202 void TestRenderPassProgram(TexCoordPrecision precision) { | 202 void TestRenderPassProgram(TexCoordPrecision precision) { |
203 EXPECT_PROGRAM_VALID(&renderer_->render_pass_program_[precision]); | 203 EXPECT_PROGRAM_VALID(&renderer_->render_pass_program_[precision]); |
204 EXPECT_EQ(renderer_->render_pass_program_[precision].program(), | 204 EXPECT_EQ(renderer_->render_pass_program_[precision].program(), |
205 renderer_->program_shadow_); | 205 renderer_->program_shadow_); |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
497 }; | 497 }; |
498 TEST_F(GLRendererTest, InitializationDoesNotMakeSynchronousCalls) { | 498 TEST_F(GLRendererTest, InitializationDoesNotMakeSynchronousCalls) { |
499 FakeOutputSurfaceClient output_surface_client; | 499 FakeOutputSurfaceClient output_surface_client; |
500 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( | 500 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( |
501 scoped_ptr<TestWebGraphicsContext3D>(new ForbidSynchronousCallContext))); | 501 scoped_ptr<TestWebGraphicsContext3D>(new ForbidSynchronousCallContext))); |
502 CHECK(output_surface->BindToClient(&output_surface_client)); | 502 CHECK(output_surface->BindToClient(&output_surface_client)); |
503 | 503 |
504 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 504 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
505 new TestSharedBitmapManager()); | 505 new TestSharedBitmapManager()); |
506 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( | 506 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
507 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1)); | 507 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
508 | 508 |
509 LayerTreeSettings settings; | 509 LayerTreeSettings settings; |
510 FakeRendererClient renderer_client; | 510 FakeRendererClient renderer_client; |
511 FakeRendererGL renderer(&renderer_client, | 511 FakeRendererGL renderer(&renderer_client, |
512 &settings, | 512 &settings, |
513 output_surface.get(), | 513 output_surface.get(), |
514 resource_provider.get()); | 514 resource_provider.get()); |
515 } | 515 } |
516 | 516 |
517 class LoseContextOnFirstGetContext : public TestWebGraphicsContext3D { | 517 class LoseContextOnFirstGetContext : public TestWebGraphicsContext3D { |
(...skipping 15 matching lines...) Expand all Loading... |
533 | 533 |
534 TEST_F(GLRendererTest, InitializationWithQuicklyLostContextDoesNotAssert) { | 534 TEST_F(GLRendererTest, InitializationWithQuicklyLostContextDoesNotAssert) { |
535 FakeOutputSurfaceClient output_surface_client; | 535 FakeOutputSurfaceClient output_surface_client; |
536 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( | 536 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( |
537 scoped_ptr<TestWebGraphicsContext3D>(new LoseContextOnFirstGetContext))); | 537 scoped_ptr<TestWebGraphicsContext3D>(new LoseContextOnFirstGetContext))); |
538 CHECK(output_surface->BindToClient(&output_surface_client)); | 538 CHECK(output_surface->BindToClient(&output_surface_client)); |
539 | 539 |
540 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 540 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
541 new TestSharedBitmapManager()); | 541 new TestSharedBitmapManager()); |
542 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( | 542 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
543 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1)); | 543 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
544 | 544 |
545 LayerTreeSettings settings; | 545 LayerTreeSettings settings; |
546 FakeRendererClient renderer_client; | 546 FakeRendererClient renderer_client; |
547 FakeRendererGL renderer(&renderer_client, | 547 FakeRendererGL renderer(&renderer_client, |
548 &settings, | 548 &settings, |
549 output_surface.get(), | 549 output_surface.get(), |
550 resource_provider.get()); | 550 resource_provider.get()); |
551 } | 551 } |
552 | 552 |
553 class ClearCountingContext : public TestWebGraphicsContext3D { | 553 class ClearCountingContext : public TestWebGraphicsContext3D { |
(...skipping 12 matching lines...) Expand all Loading... |
566 ClearCountingContext* context = context_owned.get(); | 566 ClearCountingContext* context = context_owned.get(); |
567 | 567 |
568 FakeOutputSurfaceClient output_surface_client; | 568 FakeOutputSurfaceClient output_surface_client; |
569 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( | 569 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( |
570 context_owned.PassAs<TestWebGraphicsContext3D>())); | 570 context_owned.PassAs<TestWebGraphicsContext3D>())); |
571 CHECK(output_surface->BindToClient(&output_surface_client)); | 571 CHECK(output_surface->BindToClient(&output_surface_client)); |
572 | 572 |
573 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 573 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
574 new TestSharedBitmapManager()); | 574 new TestSharedBitmapManager()); |
575 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( | 575 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
576 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1)); | 576 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
577 | 577 |
578 LayerTreeSettings settings; | 578 LayerTreeSettings settings; |
579 FakeRendererClient renderer_client; | 579 FakeRendererClient renderer_client; |
580 FakeRendererGL renderer(&renderer_client, | 580 FakeRendererGL renderer(&renderer_client, |
581 &settings, | 581 &settings, |
582 output_surface.get(), | 582 output_surface.get(), |
583 resource_provider.get()); | 583 resource_provider.get()); |
584 | 584 |
585 gfx::Rect viewport_rect(1, 1); | 585 gfx::Rect viewport_rect(1, 1); |
586 TestRenderPass* root_pass = AddRenderPass(&render_passes_in_draw_order_, | 586 TestRenderPass* root_pass = AddRenderPass(&render_passes_in_draw_order_, |
(...skipping 25 matching lines...) Expand all Loading... |
612 ClearCountingContext* context = context_owned.get(); | 612 ClearCountingContext* context = context_owned.get(); |
613 | 613 |
614 FakeOutputSurfaceClient output_surface_client; | 614 FakeOutputSurfaceClient output_surface_client; |
615 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( | 615 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( |
616 context_owned.PassAs<TestWebGraphicsContext3D>())); | 616 context_owned.PassAs<TestWebGraphicsContext3D>())); |
617 CHECK(output_surface->BindToClient(&output_surface_client)); | 617 CHECK(output_surface->BindToClient(&output_surface_client)); |
618 | 618 |
619 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 619 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
620 new TestSharedBitmapManager()); | 620 new TestSharedBitmapManager()); |
621 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( | 621 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
622 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1)); | 622 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
623 | 623 |
624 LayerTreeSettings settings; | 624 LayerTreeSettings settings; |
625 FakeRendererClient renderer_client; | 625 FakeRendererClient renderer_client; |
626 FakeRendererGL renderer(&renderer_client, | 626 FakeRendererGL renderer(&renderer_client, |
627 &settings, | 627 &settings, |
628 output_surface.get(), | 628 output_surface.get(), |
629 resource_provider.get()); | 629 resource_provider.get()); |
630 | 630 |
631 gfx::Rect viewport_rect(1, 1); | 631 gfx::Rect viewport_rect(1, 1); |
632 TestRenderPass* root_pass = AddRenderPass(&render_passes_in_draw_order_, | 632 TestRenderPass* root_pass = AddRenderPass(&render_passes_in_draw_order_, |
(...skipping 18 matching lines...) Expand all Loading... |
651 ClearCountingContext* context = context_owned.get(); | 651 ClearCountingContext* context = context_owned.get(); |
652 | 652 |
653 FakeOutputSurfaceClient output_surface_client; | 653 FakeOutputSurfaceClient output_surface_client; |
654 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::CreateOffscreen( | 654 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::CreateOffscreen( |
655 context_owned.PassAs<TestWebGraphicsContext3D>())); | 655 context_owned.PassAs<TestWebGraphicsContext3D>())); |
656 CHECK(output_surface->BindToClient(&output_surface_client)); | 656 CHECK(output_surface->BindToClient(&output_surface_client)); |
657 | 657 |
658 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 658 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
659 new TestSharedBitmapManager()); | 659 new TestSharedBitmapManager()); |
660 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( | 660 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
661 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1)); | 661 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
662 | 662 |
663 LayerTreeSettings settings; | 663 LayerTreeSettings settings; |
664 FakeRendererClient renderer_client; | 664 FakeRendererClient renderer_client; |
665 FakeRendererGL renderer(&renderer_client, | 665 FakeRendererGL renderer(&renderer_client, |
666 &settings, | 666 &settings, |
667 output_surface.get(), | 667 output_surface.get(), |
668 resource_provider.get()); | 668 resource_provider.get()); |
669 | 669 |
670 gfx::Rect viewport_rect(1, 1); | 670 gfx::Rect viewport_rect(1, 1); |
671 AddRenderPass(&render_passes_in_draw_order_, | 671 AddRenderPass(&render_passes_in_draw_order_, |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
732 base::Unretained(context))); | 732 base::Unretained(context))); |
733 | 733 |
734 FakeOutputSurfaceClient output_surface_client; | 734 FakeOutputSurfaceClient output_surface_client; |
735 scoped_ptr<OutputSurface> output_surface( | 735 scoped_ptr<OutputSurface> output_surface( |
736 FakeOutputSurface::Create3d(provider)); | 736 FakeOutputSurface::Create3d(provider)); |
737 CHECK(output_surface->BindToClient(&output_surface_client)); | 737 CHECK(output_surface->BindToClient(&output_surface_client)); |
738 | 738 |
739 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 739 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
740 new TestSharedBitmapManager()); | 740 new TestSharedBitmapManager()); |
741 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( | 741 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
742 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1)); | 742 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
743 | 743 |
744 LayerTreeSettings settings; | 744 LayerTreeSettings settings; |
745 FakeRendererClient renderer_client; | 745 FakeRendererClient renderer_client; |
746 FakeRendererGL renderer(&renderer_client, | 746 FakeRendererGL renderer(&renderer_client, |
747 &settings, | 747 &settings, |
748 output_surface.get(), | 748 output_surface.get(), |
749 resource_provider.get()); | 749 resource_provider.get()); |
750 | 750 |
751 gfx::Rect viewport_rect(1, 1); | 751 gfx::Rect viewport_rect(1, 1); |
752 AddRenderPass(&render_passes_in_draw_order_, | 752 AddRenderPass(&render_passes_in_draw_order_, |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
796 TextureStateTrackingContext* context = context_owned.get(); | 796 TextureStateTrackingContext* context = context_owned.get(); |
797 | 797 |
798 FakeOutputSurfaceClient output_surface_client; | 798 FakeOutputSurfaceClient output_surface_client; |
799 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( | 799 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( |
800 context_owned.PassAs<TestWebGraphicsContext3D>())); | 800 context_owned.PassAs<TestWebGraphicsContext3D>())); |
801 CHECK(output_surface->BindToClient(&output_surface_client)); | 801 CHECK(output_surface->BindToClient(&output_surface_client)); |
802 | 802 |
803 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 803 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
804 new TestSharedBitmapManager()); | 804 new TestSharedBitmapManager()); |
805 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( | 805 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
806 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1)); | 806 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
807 | 807 |
808 LayerTreeSettings settings; | 808 LayerTreeSettings settings; |
809 FakeRendererClient renderer_client; | 809 FakeRendererClient renderer_client; |
810 FakeRendererGL renderer(&renderer_client, | 810 FakeRendererGL renderer(&renderer_client, |
811 &settings, | 811 &settings, |
812 output_surface.get(), | 812 output_surface.get(), |
813 resource_provider.get()); | 813 resource_provider.get()); |
814 | 814 |
815 // During initialization we are allowed to set any texture parameters. | 815 // During initialization we are allowed to set any texture parameters. |
816 EXPECT_CALL(*context, texParameteri(_, _, _)).Times(AnyNumber()); | 816 EXPECT_CALL(*context, texParameteri(_, _, _)).Times(AnyNumber()); |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
875 NoClearRootRenderPassMockContext* mock_context = mock_context_owned.get(); | 875 NoClearRootRenderPassMockContext* mock_context = mock_context_owned.get(); |
876 | 876 |
877 FakeOutputSurfaceClient output_surface_client; | 877 FakeOutputSurfaceClient output_surface_client; |
878 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( | 878 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( |
879 mock_context_owned.PassAs<TestWebGraphicsContext3D>())); | 879 mock_context_owned.PassAs<TestWebGraphicsContext3D>())); |
880 CHECK(output_surface->BindToClient(&output_surface_client)); | 880 CHECK(output_surface->BindToClient(&output_surface_client)); |
881 | 881 |
882 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 882 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
883 new TestSharedBitmapManager()); | 883 new TestSharedBitmapManager()); |
884 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( | 884 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
885 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1)); | 885 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
886 | 886 |
887 LayerTreeSettings settings; | 887 LayerTreeSettings settings; |
888 settings.should_clear_root_render_pass = false; | 888 settings.should_clear_root_render_pass = false; |
889 | 889 |
890 FakeRendererClient renderer_client; | 890 FakeRendererClient renderer_client; |
891 FakeRendererGL renderer(&renderer_client, | 891 FakeRendererGL renderer(&renderer_client, |
892 &settings, | 892 &settings, |
893 output_surface.get(), | 893 output_surface.get(), |
894 resource_provider.get()); | 894 resource_provider.get()); |
895 | 895 |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
967 new ScissorTestOnClearCheckingContext); | 967 new ScissorTestOnClearCheckingContext); |
968 | 968 |
969 FakeOutputSurfaceClient output_surface_client; | 969 FakeOutputSurfaceClient output_surface_client; |
970 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( | 970 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( |
971 context_owned.PassAs<TestWebGraphicsContext3D>())); | 971 context_owned.PassAs<TestWebGraphicsContext3D>())); |
972 CHECK(output_surface->BindToClient(&output_surface_client)); | 972 CHECK(output_surface->BindToClient(&output_surface_client)); |
973 | 973 |
974 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 974 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
975 new TestSharedBitmapManager()); | 975 new TestSharedBitmapManager()); |
976 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( | 976 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
977 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1)); | 977 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
978 | 978 |
979 LayerTreeSettings settings; | 979 LayerTreeSettings settings; |
980 FakeRendererClient renderer_client; | 980 FakeRendererClient renderer_client; |
981 FakeRendererGL renderer(&renderer_client, | 981 FakeRendererGL renderer(&renderer_client, |
982 &settings, | 982 &settings, |
983 output_surface.get(), | 983 output_surface.get(), |
984 resource_provider.get()); | 984 resource_provider.get()); |
985 EXPECT_FALSE(renderer.Capabilities().using_partial_swap); | 985 EXPECT_FALSE(renderer.Capabilities().using_partial_swap); |
986 | 986 |
987 gfx::Rect viewport_rect(1, 1); | 987 gfx::Rect viewport_rect(1, 1); |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1060 FakeOutputSurfaceClient output_surface_client; | 1060 FakeOutputSurfaceClient output_surface_client; |
1061 scoped_ptr<NonReshapableOutputSurface> output_surface( | 1061 scoped_ptr<NonReshapableOutputSurface> output_surface( |
1062 new NonReshapableOutputSurface( | 1062 new NonReshapableOutputSurface( |
1063 context_owned.PassAs<TestWebGraphicsContext3D>())); | 1063 context_owned.PassAs<TestWebGraphicsContext3D>())); |
1064 CHECK(output_surface->BindToClient(&output_surface_client)); | 1064 CHECK(output_surface->BindToClient(&output_surface_client)); |
1065 output_surface->set_fixed_size(gfx::Size(100, 100)); | 1065 output_surface->set_fixed_size(gfx::Size(100, 100)); |
1066 | 1066 |
1067 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 1067 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
1068 new TestSharedBitmapManager()); | 1068 new TestSharedBitmapManager()); |
1069 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( | 1069 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
1070 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1)); | 1070 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
1071 | 1071 |
1072 LayerTreeSettings settings; | 1072 LayerTreeSettings settings; |
1073 settings.partial_swap_enabled = true; | 1073 settings.partial_swap_enabled = true; |
1074 FakeRendererClient renderer_client; | 1074 FakeRendererClient renderer_client; |
1075 FakeRendererGL renderer(&renderer_client, | 1075 FakeRendererGL renderer(&renderer_client, |
1076 &settings, | 1076 &settings, |
1077 output_surface.get(), | 1077 output_surface.get(), |
1078 resource_provider.get()); | 1078 resource_provider.get()); |
1079 EXPECT_TRUE(renderer.Capabilities().using_partial_swap); | 1079 EXPECT_TRUE(renderer.Capabilities().using_partial_swap); |
1080 | 1080 |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1245 new FlippedScissorAndViewportContext); | 1245 new FlippedScissorAndViewportContext); |
1246 | 1246 |
1247 FakeOutputSurfaceClient output_surface_client; | 1247 FakeOutputSurfaceClient output_surface_client; |
1248 scoped_ptr<OutputSurface> output_surface(new NonReshapableOutputSurface( | 1248 scoped_ptr<OutputSurface> output_surface(new NonReshapableOutputSurface( |
1249 context_owned.PassAs<TestWebGraphicsContext3D>())); | 1249 context_owned.PassAs<TestWebGraphicsContext3D>())); |
1250 CHECK(output_surface->BindToClient(&output_surface_client)); | 1250 CHECK(output_surface->BindToClient(&output_surface_client)); |
1251 | 1251 |
1252 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 1252 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
1253 new TestSharedBitmapManager()); | 1253 new TestSharedBitmapManager()); |
1254 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( | 1254 scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
1255 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1)); | 1255 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false)); |
1256 | 1256 |
1257 LayerTreeSettings settings; | 1257 LayerTreeSettings settings; |
1258 FakeRendererClient renderer_client; | 1258 FakeRendererClient renderer_client; |
1259 FakeRendererGL renderer(&renderer_client, | 1259 FakeRendererGL renderer(&renderer_client, |
1260 &settings, | 1260 &settings, |
1261 output_surface.get(), | 1261 output_surface.get(), |
1262 resource_provider.get()); | 1262 resource_provider.get()); |
1263 EXPECT_FALSE(renderer.Capabilities().using_partial_swap); | 1263 EXPECT_FALSE(renderer.Capabilities().using_partial_swap); |
1264 | 1264 |
1265 gfx::Rect device_viewport_rect(10, 10, 100, 100); | 1265 gfx::Rect device_viewport_rect(10, 10, 100, 100); |
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1620 | 1620 |
1621 class MockOutputSurfaceTest : public GLRendererTest { | 1621 class MockOutputSurfaceTest : public GLRendererTest { |
1622 protected: | 1622 protected: |
1623 virtual void SetUp() { | 1623 virtual void SetUp() { |
1624 FakeOutputSurfaceClient output_surface_client_; | 1624 FakeOutputSurfaceClient output_surface_client_; |
1625 CHECK(output_surface_.BindToClient(&output_surface_client_)); | 1625 CHECK(output_surface_.BindToClient(&output_surface_client_)); |
1626 | 1626 |
1627 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 1627 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
1628 resource_provider_ = | 1628 resource_provider_ = |
1629 ResourceProvider::Create( | 1629 ResourceProvider::Create( |
1630 &output_surface_, shared_bitmap_manager_.get(), 0, false, 1).Pass(); | 1630 &output_surface_, shared_bitmap_manager_.get(), 0, false, 1, false) |
| 1631 .Pass(); |
1631 | 1632 |
1632 renderer_.reset(new FakeRendererGL(&renderer_client_, | 1633 renderer_.reset(new FakeRendererGL(&renderer_client_, |
1633 &settings_, | 1634 &settings_, |
1634 &output_surface_, | 1635 &output_surface_, |
1635 resource_provider_.get())); | 1636 resource_provider_.get())); |
1636 } | 1637 } |
1637 | 1638 |
1638 void SwapBuffers() { renderer_->SwapBuffers(CompositorFrameMetadata()); } | 1639 void SwapBuffers() { renderer_->SwapBuffers(CompositorFrameMetadata()); } |
1639 | 1640 |
1640 void DrawFrame(float device_scale_factor, | 1641 void DrawFrame(float device_scale_factor, |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1782 base::MessageLoop::current()->Run(); | 1783 base::MessageLoop::current()->Run(); |
1783 | 1784 |
1784 // The sync point should have happened. | 1785 // The sync point should have happened. |
1785 EXPECT_EQ(1, sync_point_callback_count); | 1786 EXPECT_EQ(1, sync_point_callback_count); |
1786 EXPECT_EQ(1, other_callback_count); | 1787 EXPECT_EQ(1, other_callback_count); |
1787 } | 1788 } |
1788 #endif // OS_ANDROID | 1789 #endif // OS_ANDROID |
1789 | 1790 |
1790 } // namespace | 1791 } // namespace |
1791 } // namespace cc | 1792 } // namespace cc |
OLD | NEW |