1
=== modified file 'src/server/graphics/nested/host_connection.h'
2
--- src/server/graphics/nested/host_connection.h	2017-02-01 22:30:52 +0000
3
+++ src/server/graphics/nested/host_connection.h	2017-02-10 13:00:53 +0000
4
@@ -78,7 +78,7 @@
5
78
    virtual std::shared_ptr<NativeBuffer> create_buffer(graphics::BufferProperties const&) = 0;
78
    virtual std::shared_ptr<NativeBuffer> create_buffer(graphics::BufferProperties const&) = 0;
6
79
    virtual std::shared_ptr<NativeBuffer> create_buffer(mir::geometry::Size, MirPixelFormat format) = 0;
79
    virtual std::shared_ptr<NativeBuffer> create_buffer(mir::geometry::Size, MirPixelFormat format) = 0;
7
80
    virtual std::shared_ptr<NativeBuffer> create_buffer(geometry::Size, uint32_t format, uint32_t flags) = 0;
80
    virtual std::shared_ptr<NativeBuffer> create_buffer(geometry::Size, uint32_t format, uint32_t flags) = 0;
9
81
    virtual bool supports_passthrough() = 0;
81
    virtual bool supports_passthrough(graphics::BufferUsage) = 0;
10
82
    virtual void apply_input_configuration(MirInputConfig const* config) = 0;
82
    virtual void apply_input_configuration(MirInputConfig const* config) = 0;
11
83
83
12
84
protected:
84
protected:
13
85
85
14
=== modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
15
--- src/server/graphics/nested/mir_client_host_connection.cpp	2017-02-09 06:56:31 +0000
16
+++ src/server/graphics/nested/mir_client_host_connection.cpp	2017-02-10 13:00:53 +0000
17
@@ -854,13 +854,13 @@
18
854
    return std::make_unique<SurfaceSpec>(mir_connection);
854
    return std::make_unique<SurfaceSpec>(mir_connection);
19
855
}
855
}
20
856
856
22
857
bool mgn::MirClientHostConnection::supports_passthrough()
857
bool mgn::MirClientHostConnection::supports_passthrough(mg::BufferUsage usage)
23
858
{
858
{
29
859
    auto buffer = create_buffer(geom::Size{1, 1} , mir_pixel_format_abgr_8888);
859
    //FIXME: ShmBuffers currently don't upload properly. The logic here uses
30
860
    auto hints = buffer->egl_image_creation_hints();
860
    //       passthrough where supported (ANativeWindowBuffer and gbm_bo)
31
861
    if (std::get<1>(hints) == nullptr && std::get<2>(hints) == nullptr)
861
    //       (LP: #1663062 for more details)
32
862
        return false;
862
    return (mir_extension_android_buffer_v1(mir_connection) || 
33
863
    return true;
863
           ((mir_extension_gbm_buffer_v1(mir_connection) && usage == mg::BufferUsage::hardware)));
34
864
}
864
}
35
865
865
36
866
void mgn::MirClientHostConnection::apply_input_configuration(MirInputConfig const* config)
866
void mgn::MirClientHostConnection::apply_input_configuration(MirInputConfig const* config)
37
867
867
38
=== modified file 'src/server/graphics/nested/mir_client_host_connection.h'
39
--- src/server/graphics/nested/mir_client_host_connection.h	2017-01-31 19:36:45 +0000
40
+++ src/server/graphics/nested/mir_client_host_connection.h	2017-02-10 13:00:53 +0000
41
@@ -87,7 +87,7 @@
42
87
    std::shared_ptr<NativeBuffer> create_buffer(graphics::BufferProperties const&) override;
87
    std::shared_ptr<NativeBuffer> create_buffer(graphics::BufferProperties const&) override;
43
88
    std::shared_ptr<NativeBuffer> create_buffer(geometry::Size, MirPixelFormat) override;
88
    std::shared_ptr<NativeBuffer> create_buffer(geometry::Size, MirPixelFormat) override;
44
89
    std::shared_ptr<NativeBuffer> create_buffer(geometry::Size, uint32_t format, uint32_t flags) override;
89
    std::shared_ptr<NativeBuffer> create_buffer(geometry::Size, uint32_t format, uint32_t flags) override;
46
90
    bool supports_passthrough() override;
90
    bool supports_passthrough(BufferUsage usage) override;
47
91
    void apply_input_configuration(MirInputConfig const* config) override;
91
    void apply_input_configuration(MirInputConfig const* config) override;
48
92
92
49
93
    optional_value<std::shared_ptr<MesaAuthExtension>> auth_extension() override;
93
    optional_value<std::shared_ptr<MesaAuthExtension>> auth_extension() override;
50
94
94
51
=== modified file 'src/server/graphics/nested/platform.cpp'
52
--- src/server/graphics/nested/platform.cpp	2017-01-30 08:13:20 +0000
53
+++ src/server/graphics/nested/platform.cpp	2017-02-10 13:00:53 +0000
54
@@ -75,7 +75,7 @@
55
75
75
56
76
    std::shared_ptr<mg::Buffer> alloc_buffer(mg::BufferProperties const& properties) override
76
    std::shared_ptr<mg::Buffer> alloc_buffer(mg::BufferProperties const& properties) override
57
77
    {
77
    {
59
78
        if (passthrough_candidate(properties.size))
78
        if (passthrough_candidate(properties.size, properties.usage))
60
79
            return std::make_shared<mgn::Buffer>(connection, properties);
79
            return std::make_shared<mgn::Buffer>(connection, properties);
61
80
        else
80
        else
62
81
            return guest_allocator->alloc_buffer(properties);
81
            return guest_allocator->alloc_buffer(properties);
63
@@ -84,7 +84,7 @@
64
84
    std::shared_ptr<mg::Buffer> alloc_buffer(
84
    std::shared_ptr<mg::Buffer> alloc_buffer(
65
85
        mir::geometry::Size size, uint32_t native_format, uint32_t native_flags) override
85
        mir::geometry::Size size, uint32_t native_format, uint32_t native_flags) override
66
86
    {
86
    {
68
87
        if (passthrough_candidate(size))
87
        if (passthrough_candidate(size, mg::BufferUsage::hardware))
69
88
            return std::make_shared<mgn::Buffer>(connection, size, native_format, native_flags);
88
            return std::make_shared<mgn::Buffer>(connection, size, native_format, native_flags);
70
89
        else
89
        else
71
90
            return guest_allocator->alloc_buffer(size, native_format, native_flags);
90
            return guest_allocator->alloc_buffer(size, native_format, native_flags);
72
@@ -92,7 +92,7 @@
73
92
92
74
93
    std::shared_ptr<mg::Buffer> alloc_software_buffer(mir::geometry::Size size, MirPixelFormat format) override
93
    std::shared_ptr<mg::Buffer> alloc_software_buffer(mir::geometry::Size size, MirPixelFormat format) override
75
94
    {
94
    {
77
95
        if (passthrough_candidate(size))
95
        if (passthrough_candidate(size, mg::BufferUsage::software))
78
96
            return std::make_shared<mgn::Buffer>(connection, size, format);
96
            return std::make_shared<mgn::Buffer>(connection, size, format);
79
97
        else
97
        else
80
98
            return guest_allocator->alloc_software_buffer(size, format);
98
            return guest_allocator->alloc_software_buffer(size, format);
81
@@ -104,9 +104,10 @@
82
104
    }
104
    }
83
105
105
84
106
private:
106
private:
86
107
    bool passthrough_candidate(mir::geometry::Size size)
107
    bool passthrough_candidate(mir::geometry::Size size, mg::BufferUsage usage)
87
108
    {
108
    {
89
109
        return (size.width >= mir::geometry::Width{480}) && (size.height >= mir::geometry::Height{480});
109
        return connection->supports_passthrough(usage) &&
90
110
            (size.width >= mir::geometry::Width{480}) && (size.height >= mir::geometry::Height{480});
91
110
    }
111
    }
92
111
    std::shared_ptr<mgn::HostConnection> const connection;
112
    std::shared_ptr<mgn::HostConnection> const connection;
93
112
    std::shared_ptr<mg::GraphicBufferAllocator> const guest_allocator;
113
    std::shared_ptr<mg::GraphicBufferAllocator> const guest_allocator;
94
@@ -115,7 +116,8 @@
95
115
116
96
116
mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgn::Platform::create_buffer_allocator()
117
mir::UniqueModulePtr<mg::GraphicBufferAllocator> mgn::Platform::create_buffer_allocator()
97
117
{
118
{
99
118
    if (connection->supports_passthrough())
119
    if (connection->supports_passthrough(mg::BufferUsage::software) ||
100
120
        connection->supports_passthrough(mg::BufferUsage::hardware))
101
119
    {
121
    {
102
120
        return mir::make_module_ptr<BufferAllocator>(connection, guest_platform->create_buffer_allocator());
122
        return mir::make_module_ptr<BufferAllocator>(connection, guest_platform->create_buffer_allocator());
103
121
    }
123
    }
104
122
124
105
=== modified file 'tests/include/mir/test/doubles/stub_host_connection.h'
106
--- tests/include/mir/test/doubles/stub_host_connection.h	2017-02-01 22:30:52 +0000
107
+++ tests/include/mir/test/doubles/stub_host_connection.h	2017-02-10 13:00:53 +0000
108
@@ -177,7 +177,7 @@
109
177
        }; 
177
        }; 
110
178
        return std::make_unique<NullSpec>();
178
        return std::make_unique<NullSpec>();
111
179
    }
179
    }
113
180
    bool supports_passthrough()
180
    bool supports_passthrough(graphics::BufferUsage)
114
181
    {
181
    {
115
182
        return true;
182
        return true;
116
183
    }
183
    }
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt		2017-02-09	Approve on 2017-02-14
Cemil Azizoglu (community)			Approve on 2017-02-13
Mir CI Bot	continuous-integration		Approve on 2017-02-10
Review via email: mp+316894@code.launchpad.net