1
=== modified file 'include/server/mir/frontend/buffer_stream.h'
2
--- include/server/mir/frontend/buffer_stream.h	2017-05-08 03:04:26 +0000
3
+++ include/server/mir/frontend/buffer_stream.h	2017-07-21 05:28:32 +0000
4
@@ -63,7 +63,6 @@
5
63
    //      side once we only support the NBS system.
63
    //      side once we only support the NBS system.
6
64
    virtual void allow_framedropping(bool) = 0;
64
    virtual void allow_framedropping(bool) = 0;
7
65
    virtual void set_scale(float scale) = 0;
65
    virtual void set_scale(float scale) = 0;
8
66
    virtual bool suitable_for_cursor() const = 0;
9
67
protected:
66
protected:
10
68
    BufferStream() = default;
67
    BufferStream() = default;
11
69
    BufferStream(BufferStream const&) = delete;
68
    BufferStream(BufferStream const&) = delete;
12
70
69
13
=== modified file 'src/server/compositor/stream.cpp'
14
--- src/server/compositor/stream.cpp	2017-07-04 04:06:59 +0000
15
+++ src/server/compositor/stream.cpp	2017-07-21 05:28:32 +0000
16
@@ -201,10 +201,3 @@
17
201
void mc::Stream::set_scale(float)
201
void mc::Stream::set_scale(float)
18
202
{
202
{
19
203
}
203
}
20
204
21
205
bool mc::Stream::suitable_for_cursor() const
22
206
{
23
207
    // We can't reasonably answer this question -
24
208
    // Suitability for cursor use is a per-buffer property, not a per-stream property.
25
209
    return true;
26
210
}
27
211
204
28
=== modified file 'src/server/compositor/stream.h'
29
--- src/server/compositor/stream.h	2017-07-04 00:54:25 +0000
30
+++ src/server/compositor/stream.h	2017-07-21 05:28:32 +0000
31
@@ -59,7 +59,6 @@
32
59
    void associate_buffer(graphics::BufferID) override;
59
    void associate_buffer(graphics::BufferID) override;
33
60
    void disassociate_buffer(graphics::BufferID) override;
60
    void disassociate_buffer(graphics::BufferID) override;
34
61
    void set_scale(float scale) override;
61
    void set_scale(float scale) override;
35
62
    bool suitable_for_cursor() const override;
36
63
62
37
64
private:
63
private:
38
65
    enum class ScheduleMode;
64
    enum class ScheduleMode;
39
66
65
40
=== modified file 'src/server/frontend/session_mediator.cpp'
41
--- src/server/frontend/session_mediator.cpp	2017-07-18 01:32:08 +0000
42
+++ src/server/frontend/session_mediator.cpp	2017-07-21 05:28:32 +0000
43
@@ -757,8 +757,6 @@
44
757
    {
757
    {
45
758
        mf::BufferStreamId id{surface_specification.cursor_id().value()};
758
        mf::BufferStreamId id{surface_specification.cursor_id().value()};
46
759
        auto stream = session->get_buffer_stream(id);
759
        auto stream = session->get_buffer_stream(id);
47
760
        if (!stream->suitable_for_cursor())
48
761
            BOOST_THROW_EXCEPTION(std::logic_error("Cursor buffer streams must have mir_pixel_format_argb_8888 format"));
49
762
        mods.stream_cursor = msh::StreamCursor{
760
        mods.stream_cursor = msh::StreamCursor{
50
763
            id, geom::Displacement{surface_specification.hotspot_x(), surface_specification.hotspot_y()} };
761
            id, geom::Displacement{surface_specification.hotspot_x(), surface_specification.hotspot_y()} };
51
764
    }
762
    }
52
@@ -1059,9 +1057,6 @@
53
1059
        auto hotspot = geom::Displacement{cursor_request->hotspot_x(), cursor_request->hotspot_y()};
1057
        auto hotspot = geom::Displacement{cursor_request->hotspot_x(), cursor_request->hotspot_y()};
54
1060
        auto stream = session->get_buffer_stream(stream_id);
1058
        auto stream = session->get_buffer_stream(stream_id);
55
1061
1059
56
1062
        if (!stream->suitable_for_cursor())
57
1063
            BOOST_THROW_EXCEPTION(std::logic_error("Cursor buffer streams must have mir_pixel_format_argb_8888 format"));
58
1064
59
1065
        surface->set_cursor_stream(stream, hotspot);
1060
        surface->set_cursor_stream(stream, hotspot);
60
1066
    }
1061
    }
61
1067
    else
1062
    else
62
1068
1063
63
=== modified file 'tests/include/mir/test/doubles/mock_buffer_stream.h'
64
--- tests/include/mir/test/doubles/mock_buffer_stream.h	2017-05-08 03:04:26 +0000
65
+++ tests/include/mir/test/doubles/mock_buffer_stream.h	2017-07-21 05:28:32 +0000
66
@@ -53,8 +53,6 @@
67
53
            .WillByDefault(testing::Return(mir_pixel_format_abgr_8888));
53
            .WillByDefault(testing::Return(mir_pixel_format_abgr_8888));
68
54
        ON_CALL(*this, stream_size())
54
        ON_CALL(*this, stream_size())
69
55
            .WillByDefault(testing::Return(geometry::Size{0,0}));
55
            .WillByDefault(testing::Return(geometry::Size{0,0}));
70
56
        ON_CALL(*this, suitable_for_cursor())
71
57
            .WillByDefault(testing::Return(true));
72
58
    }
56
    }
73
59
    std::shared_ptr<StubBuffer> buffer { std::make_shared<StubBuffer>() };
57
    std::shared_ptr<StubBuffer> buffer { std::make_shared<StubBuffer>() };
74
60
    MOCK_METHOD1(acquire_client_buffer, void(std::function<void(graphics::Buffer* buffer)>));
58
    MOCK_METHOD1(acquire_client_buffer, void(std::function<void(graphics::Buffer* buffer)>));
75
@@ -82,7 +80,6 @@
76
82
    MOCK_METHOD1(disassociate_buffer, void(graphics::BufferID));
80
    MOCK_METHOD1(disassociate_buffer, void(graphics::BufferID));
77
83
    MOCK_METHOD1(associate_buffer, void(graphics::BufferID));
81
    MOCK_METHOD1(associate_buffer, void(graphics::BufferID));
78
84
    MOCK_METHOD1(set_scale, void(float));
82
    MOCK_METHOD1(set_scale, void(float));
79
85
    MOCK_CONST_METHOD0(suitable_for_cursor, bool());
80
86
83
81
87
};
84
};
82
88
}
85
}
83
89
86
84
=== modified file 'tests/include/mir/test/doubles/stub_buffer_stream.h'
85
--- tests/include/mir/test/doubles/stub_buffer_stream.h	2017-05-08 03:04:26 +0000
86
+++ tests/include/mir/test/doubles/stub_buffer_stream.h	2017-07-21 05:28:32 +0000
87
@@ -82,7 +82,6 @@
88
82
    void associate_buffer(graphics::BufferID) override {}
82
    void associate_buffer(graphics::BufferID) override {}
89
83
    void disassociate_buffer(graphics::BufferID) override {}
83
    void disassociate_buffer(graphics::BufferID) override {}
90
84
    void set_scale(float) override {}
84
    void set_scale(float) override {}
91
85
    bool suitable_for_cursor() const override { return false; }
92
86
85
93
87
    std::shared_ptr<graphics::Buffer> stub_compositor_buffer;
86
    std::shared_ptr<graphics::Buffer> stub_compositor_buffer;
94
88
    int nready = 0;
87
    int nready = 0;
Status:	Merged
Approved by:	Alan Griffiths on 2017-07-21
Approved revision:	no longer in the source branch.
Merged at revision:	4212
Proposed branch:	lp:~raof/mir/cursor-suitability-is-per-buffer
Merge into:	lp:mir
Prerequisite:	lp:~raof/mir/better-buffer-plumbing
Diff against target:	94 lines (+0/-18) 6 files modified include/server/mir/frontend/buffer_stream.h (+0/-1) src/server/compositor/stream.cpp (+0/-7) src/server/compositor/stream.h (+0/-1) src/server/frontend/session_mediator.cpp (+0/-5) tests/include/mir/test/doubles/mock_buffer_stream.h (+0/-3) tests/include/mir/test/doubles/stub_buffer_stream.h (+0/-1)
To merge this branch:	bzr merge lp:~raof/mir/cursor-suitability-is-per-buffer
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-07-21
Alan Griffiths			Approve on 2017-07-20
Brandon Schaefer (community)		2017-07-19	Approve on 2017-07-20
Review via email: mp+327666@code.launchpad.net