1
=== modified file 'src/platform/graphics/android/hwc_layerlist.cpp'
2
--- src/platform/graphics/android/hwc_layerlist.cpp	2014-04-09 21:51:31 +0000
3
+++ src/platform/graphics/android/hwc_layerlist.cpp	2014-04-30 21:59:21 +0000
4
@@ -72,6 +72,7 @@
5
72
                renderable->screen_position(), renderable->alpha_enabled());
72
                renderable->screen_position(), renderable->alpha_enabled());
6
73
            layers_it->set_buffer(*renderable->buffer());
73
            layers_it->set_buffer(*renderable->buffer());
7
74
            any_buffer_updated |= layers_it->needs_hwc_commit(); 
74
            any_buffer_updated |= layers_it->needs_hwc_commit(); 
8
75
            layers_it->set_layer_type(mga::LayerType::gl_rendered);
9
75
            layers_it++;
76
            layers_it++;
10
76
        }
77
        }
11
77
    }
78
    }
12
78
79
13
=== modified file 'tests/unit-tests/graphics/android/test_hwc_device.cpp'
14
--- tests/unit-tests/graphics/android/test_hwc_device.cpp	2014-04-15 21:45:42 +0000
15
+++ tests/unit-tests/graphics/android/test_hwc_device.cpp	2014-04-30 21:59:21 +0000
16
@@ -603,3 +603,47 @@
17
603
    device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
603
    device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
18
604
    device.post(mock_buffer);
604
    device.post(mock_buffer);
19
605
}
605
}
20
606
21
607
TEST_F(HwcDevice, resets_composition_type_with_prepare) //lp:1314399
22
608
{
23
609
    using namespace testing;
24
610
    auto native_handle_1 = std::make_shared<mtd::StubAndroidNativeBuffer>();
25
611
    auto native_handle_2 = std::make_shared<mtd::StubAndroidNativeBuffer>();
26
612
    auto native_handle_3 = std::make_shared<mtd::StubAndroidNativeBuffer>();
27
613
    native_handle_1->anwb()->width = buffer_size.width.as_int();
28
614
    native_handle_1->anwb()->height = buffer_size.height.as_int();
29
615
    native_handle_2->anwb()->width = buffer_size.width.as_int();
30
616
    native_handle_2->anwb()->height = buffer_size.height.as_int();
31
617
    native_handle_3->anwb()->width = buffer_size.width.as_int();
32
618
    native_handle_3->anwb()->height = buffer_size.height.as_int();
33
619
34
620
    EXPECT_CALL(mock_buffer, native_buffer_handle())
35
621
        .WillOnce(Return(native_handle_1))
36
622
        .WillOnce(Return(native_handle_2))
37
623
        .WillOnce(Return(native_handle_3));
38
624
39
625
    std::list<std::shared_ptr<mg::Renderable>> updated_list({stub_renderable1});
40
626
41
627
    mga::HwcDevice device(mock_device, mock_hwc_device_wrapper, mock_vsync, mock_file_ops);
42
628
43
629
    Sequence seq; 
44
630
    EXPECT_CALL(*mock_hwc_device_wrapper, prepare(_))
45
631
        .InSequence(seq)
46
632
        .WillOnce(Invoke([&](hwc_display_contents_1_t& contents)
47
633
        {
48
634
            ASSERT_THAT(contents.numHwLayers, Ge(1));
49
635
            contents.hwLayers[0].compositionType = HWC_OVERLAY;
50
636
            contents.hwLayers[1].compositionType = HWC_FRAMEBUFFER_TARGET;
51
637
        }));
52
638
    EXPECT_CALL(*mock_hwc_device_wrapper, prepare(_))
53
639
        .InSequence(seq)
54
640
        .WillOnce(Invoke([&](hwc_display_contents_1_t& contents)
55
641
        {
56
642
            ASSERT_THAT(contents.numHwLayers, Ge(1));
57
643
            EXPECT_EQ(HWC_FRAMEBUFFER, contents.hwLayers[0].compositionType);
58
644
        }));
59
645
60
646
    device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
61
647
    device.render_gl_and_overlays(stub_context, updated_list, [](mg::Renderable const&){});
62
648
    device.post(mock_buffer);
63
649
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-05-03
Alberto Aguirre (community)			Approve on 2014-05-01
Alan Griffiths			Approve on 2014-05-01
Daniel van Vugt		2014-04-30	Approve on 2014-05-01
Review via email: mp+217834@code.launchpad.net