1
=== modified file 'src/platforms/mesa/server/kms/display_buffer.cpp'
2
--- src/platforms/mesa/server/kms/display_buffer.cpp	2017-07-28 17:00:43 +0000
3
+++ src/platforms/mesa/server/kms/display_buffer.cpp	2017-10-13 14:07:57 +0000
4
@@ -504,7 +504,7 @@
5
504
    make_current();
504
    make_current();
6
505
505
7
506
    listener->report_successful_egl_make_current_on_construction();
506
    listener->report_successful_egl_make_current_on_construction();
9
507
    
507
10
508
    glClear(GL_COLOR_BUFFER_BIT);
508
    glClear(GL_COLOR_BUFFER_BIT);
11
509
509
12
510
    surface.swap_buffers();
510
    surface.swap_buffers();
13
@@ -591,9 +591,7 @@
14
591
        {
591
        {
15
592
            auto bypass_buffer = (*bypass_it)->buffer();
592
            auto bypass_buffer = (*bypass_it)->buffer();
16
593
            auto native = std::dynamic_pointer_cast<mgm::NativeBuffer>(bypass_buffer->native_buffer_handle());
593
            auto native = std::dynamic_pointer_cast<mgm::NativeBuffer>(bypass_buffer->native_buffer_handle());
20
594
            if (!native)
594
            if (native && native->flags & mir_buffer_flag_can_scanout &&
18
595
                BOOST_THROW_EXCEPTION(std::invalid_argument("could not convert NativeBuffer"));
19
596
            if (native->flags & mir_buffer_flag_can_scanout &&
21
597
                bypass_buffer->size() == surface.size() &&
595
                bypass_buffer->size() == surface.size() &&
22
598
                !needs_bounce_buffer(*outputs.front(), native->bo))
596
                !needs_bounce_buffer(*outputs.front(), native->bo))
23
599
            {
597
            {
24
@@ -776,7 +774,7 @@
25
776
774
26
777
        visible_bypass_frame = scheduled_bypass_frame;
775
        visible_bypass_frame = scheduled_bypass_frame;
27
778
        scheduled_bypass_frame = nullptr;
776
        scheduled_bypass_frame = nullptr;
29
779
    
777
30
780
        visible_composite_frame = std::move(scheduled_composite_frame);
778
        visible_composite_frame = std::move(scheduled_composite_frame);
31
781
        scheduled_composite_frame = nullptr;
779
        scheduled_composite_frame = nullptr;
32
782
    }
780
    }
Status:	Merged
Approved by:	Brandon Schaefer on 2017-10-14
Approved revision:	no longer in the source branch.
Merged at revision:	4289
Proposed branch:	lp:~alan-griffiths/mir/fix-1723235
Merge into:	lp:mir
Diff against target:	32 lines (+3/-5) 1 file modified src/platforms/mesa/server/kms/display_buffer.cpp (+3/-5)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/fix-1723235
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Brandon Schaefer (community)		2017-10-13	Approve on 2017-10-14
Mir CI Bot	continuous-integration		Approve on 2017-10-13
Review via email: mp+332241@code.launchpad.net