1
=== modified file 'src/platform/graphics/mesa/native_platform.cpp'
2
--- src/platform/graphics/mesa/native_platform.cpp	2014-03-06 06:05:17 +0000
3
+++ src/platform/graphics/mesa/native_platform.cpp	2014-03-12 02:47:17 +0000
4
@@ -25,8 +25,13 @@
5
25
#include "mir/graphics/platform_ipc_package.h"
25
#include "mir/graphics/platform_ipc_package.h"
6
26
#include "mir/graphics/nested_context.h"
26
#include "mir/graphics/nested_context.h"
7
27
27
8
28
#include "internal_client.h"
9
29
#include "internal_native_display.h"
10
30
11
28
#include <boost/exception/errinfo_errno.hpp>
31
#include <boost/exception/errinfo_errno.hpp>
12
29
#include <boost/throw_exception.hpp>
32
#include <boost/throw_exception.hpp>
13
33
14
34
#include <mutex>
15
30
#include <stdexcept>
35
#include <stdexcept>
16
31
36
17
32
namespace mg = mir::graphics;
37
namespace mg = mir::graphics;
18
@@ -42,6 +47,11 @@
19
42
    nested_context->drm_set_gbm_device(gbm.device);
47
    nested_context->drm_set_gbm_device(gbm.device);
20
43
}
48
}
21
44
49
22
50
mgm::NativePlatform::~NativePlatform()
23
51
{
24
52
    finish_internal_native_display();
25
53
}
26
54
27
45
std::shared_ptr<mg::GraphicBufferAllocator> mgm::NativePlatform::create_buffer_allocator(
55
std::shared_ptr<mg::GraphicBufferAllocator> mgm::NativePlatform::create_buffer_allocator(
28
46
        std::shared_ptr<mg::BufferInitializer> const& buffer_initializer)
56
        std::shared_ptr<mg::BufferInitializer> const& buffer_initializer)
29
47
{
57
{
30
@@ -82,7 +92,8 @@
31
82
92
32
83
std::shared_ptr<mg::InternalClient> mgm::NativePlatform::create_internal_client()
93
std::shared_ptr<mg::InternalClient> mgm::NativePlatform::create_internal_client()
33
84
{
94
{
35
85
    BOOST_THROW_EXCEPTION(std::runtime_error("MesaNativePlatform::create_internal_client is not implemented yet!"));
95
    auto nd = ensure_internal_native_display(get_ipc_package());
36
96
    return std::make_shared<mgm::InternalClient>(nd);
37
86
}
97
}
38
87
98
39
88
void mgm::NativePlatform::fill_ipc_package(BufferIPCPacker* packer, Buffer const* buffer) const
99
void mgm::NativePlatform::fill_ipc_package(BufferIPCPacker* packer, Buffer const* buffer) const
40
@@ -106,3 +117,37 @@
41
106
{
117
{
42
107
    return std::make_shared<mgm::NativePlatform>();
118
    return std::make_shared<mgm::NativePlatform>();
43
108
}
119
}
44
120
45
121
namespace
46
122
{
47
123
std::shared_ptr<mgm::InternalNativeDisplay> native_display = nullptr;
48
124
std::mutex native_display_guard;
49
125
}
50
126
51
127
bool mgm::NativePlatform::internal_native_display_in_use()
52
128
{
53
129
    std::unique_lock<std::mutex> lg(native_display_guard);
54
130
    return native_display != nullptr;
55
131
}
56
132
57
133
std::shared_ptr<mgm::InternalNativeDisplay> mgm::NativePlatform::internal_native_display()
58
134
{
59
135
    std::unique_lock<std::mutex> lg(native_display_guard);
60
136
    return native_display;
61
137
}
62
138
63
139
std::shared_ptr<mgm::InternalNativeDisplay> mgm::NativePlatform::ensure_internal_native_display(
64
140
    std::shared_ptr<mg::PlatformIPCPackage> const& package)
65
141
{
66
142
    std::unique_lock<std::mutex> lg(native_display_guard);
67
143
    if (!native_display)
68
144
        native_display = std::make_shared<mgm::InternalNativeDisplay>(package);
69
145
    return native_display;
70
146
}
71
147
72
148
void mgm::NativePlatform::finish_internal_native_display()
73
149
{
74
150
    std::unique_lock<std::mutex> lg(native_display_guard);
75
151
    native_display.reset();
76
152
}
77
153
78
109
154
79
=== modified file 'src/platform/graphics/mesa/native_platform.h'
80
--- src/platform/graphics/mesa/native_platform.h	2014-03-06 06:05:17 +0000
81
+++ src/platform/graphics/mesa/native_platform.h	2014-03-12 02:47:17 +0000
82
@@ -30,20 +30,30 @@
83
30
{
30
{
84
31
namespace mesa
31
namespace mesa
85
32
{
32
{
86
33
class InternalNativeDisplay; 
87
34
88
33
class NativePlatform : public graphics::NativePlatform
35
class NativePlatform : public graphics::NativePlatform
89
34
{
36
{
90
35
public:
37
public:
91
38
    virtual ~NativePlatform();
92
39
93
36
    void initialize(std::shared_ptr<NestedContext> const& nested_context);
40
    void initialize(std::shared_ptr<NestedContext> const& nested_context);
94
37
    std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
41
    std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
95
38
        std::shared_ptr<BufferInitializer> const& buffer_initializer) override;
42
        std::shared_ptr<BufferInitializer> const& buffer_initializer) override;
96
39
    std::shared_ptr<PlatformIPCPackage> get_ipc_package() override;
43
    std::shared_ptr<PlatformIPCPackage> get_ipc_package() override;
97
40
    std::shared_ptr<InternalClient> create_internal_client() override;
44
    std::shared_ptr<InternalClient> create_internal_client() override;
98
41
    void fill_ipc_package(BufferIPCPacker* packer, Buffer const* buffer) const override;
45
    void fill_ipc_package(BufferIPCPacker* packer, Buffer const* buffer) const override;
99
46
    
100
47
    static std::shared_ptr<InternalNativeDisplay> internal_native_display();
101
48
    static bool internal_native_display_in_use();
102
42
49
103
43
private:
50
private:
104
44
    int drm_fd;
51
    int drm_fd;
105
45
    std::shared_ptr<NestedContext> nested_context;
52
    std::shared_ptr<NestedContext> nested_context;
106
46
    helpers::GBMHelper gbm;
53
    helpers::GBMHelper gbm;
107
54
108
55
    static std::shared_ptr<InternalNativeDisplay> ensure_internal_native_display(std::shared_ptr<PlatformIPCPackage> const& package);
109
56
    static void finish_internal_native_display();
110
47
};
57
};
111
48
}
58
}
112
49
}
59
}
113
50
60
114
=== modified file 'src/platform/graphics/mesa/platform.cpp'
115
--- src/platform/graphics/mesa/platform.cpp	2014-03-06 06:05:17 +0000
116
+++ src/platform/graphics/mesa/platform.cpp	2014-03-12 02:47:17 +0000
117
@@ -17,6 +17,7 @@
118
17
 */
17
 */
119
18
18
120
19
#include "platform.h"
19
#include "platform.h"
121
20
#include "native_platform.h"
122
20
#include "buffer_allocator.h"
21
#include "buffer_allocator.h"
123
21
#include "display.h"
22
#include "display.h"
124
22
#include "internal_client.h"
23
#include "internal_client.h"
125
@@ -179,6 +180,12 @@
126
179
180
127
180
extern "C" int mir_server_mesa_egl_native_display_is_valid(MirMesaEGLNativeDisplay* display)
181
extern "C" int mir_server_mesa_egl_native_display_is_valid(MirMesaEGLNativeDisplay* display)
128
181
{
182
{
131
182
    return ((mgm::Platform::internal_display_clients_present) &&
183
    bool nested_internal_display_in_use = mgm::NativePlatform::internal_native_display_in_use();
132
183
            (display == mgm::Platform::internal_native_display.get()));
184
    bool host_internal_display_in_use = mgm::Platform::internal_display_clients_present;
133
185
134
186
    if (host_internal_display_in_use)
135
187
        return (display == mgm::Platform::internal_native_display.get());
136
188
    else if (nested_internal_display_in_use)
137
189
        return (display == mgm::NativePlatform::internal_native_display().get());
138
190
    return 0;
139
184
}
191
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-03-11	Approve on 2014-03-13
Alan Griffiths		2014-03-11	Approve on 2014-03-12
Daniel van Vugt		2014-03-11	Approve on 2014-03-12
Kevin DuBois		2014-03-11	Pending
Review via email: mp+210514@code.launchpad.net
1	=== modified file 'src/platform/graphics/mesa/native_platform.cpp'
2	--- src/platform/graphics/mesa/native_platform.cpp 2014-03-06 06:05:17 +0000
3	+++ src/platform/graphics/mesa/native_platform.cpp 2014-03-12 02:47:17 +0000
4	@@ -25,8 +25,13 @@
5	25	#include "mir/graphics/platform_ipc_package.h"	25	#include "mir/graphics/platform_ipc_package.h"
6	26	#include "mir/graphics/nested_context.h"	26	#include "mir/graphics/nested_context.h"
7	27		27
8			28	#include "internal_client.h"
9			29	#include "internal_native_display.h"
10			30
11	28	#include <boost/exception/errinfo_errno.hpp>	31	#include <boost/exception/errinfo_errno.hpp>
12	29	#include <boost/throw_exception.hpp>	32	#include <boost/throw_exception.hpp>
13			33
14			34	#include <mutex>
15	30	#include <stdexcept>	35	#include <stdexcept>
16	31		36
17	32	namespace mg = mir::graphics;	37	namespace mg = mir::graphics;
18	@@ -42,6 +47,11 @@
19	42	nested_context->drm_set_gbm_device(gbm.device);	47	nested_context->drm_set_gbm_device(gbm.device);
20	43	}	48	}
21	44		49
22			50	mgm::NativePlatform::~NativePlatform()
23			51	{
24			52	finish_internal_native_display();
25			53	}
26			54
27	45	std::shared_ptr<mg::GraphicBufferAllocator> mgm::NativePlatform::create_buffer_allocator(	55	std::shared_ptr<mg::GraphicBufferAllocator> mgm::NativePlatform::create_buffer_allocator(
28	46	std::shared_ptr<mg::BufferInitializer> const& buffer_initializer)	56	std::shared_ptr<mg::BufferInitializer> const& buffer_initializer)
29	47	{	57	{
30	@@ -82,7 +92,8 @@
31	82		92
32	83	std::shared_ptr<mg::InternalClient> mgm::NativePlatform::create_internal_client()	93	std::shared_ptr<mg::InternalClient> mgm::NativePlatform::create_internal_client()
33	84	{	94	{
35	85	BOOST_THROW_EXCEPTION(std::runtime_error("MesaNativePlatform::create_internal_client is not implemented yet!"));	95	auto nd = ensure_internal_native_display(get_ipc_package());
36			96	return std::make_shared<mgm::InternalClient>(nd);
37	86	}	97	}
38	87		98
39	88	void mgm::NativePlatform::fill_ipc_package(BufferIPCPacker* packer, Buffer const* buffer) const	99	void mgm::NativePlatform::fill_ipc_package(BufferIPCPacker* packer, Buffer const* buffer) const
40	@@ -106,3 +117,37 @@
41	106	{	117	{
42	107	return std::make_shared<mgm::NativePlatform>();	118	return std::make_shared<mgm::NativePlatform>();
43	108	}	119	}
44			120
45			121	namespace
46			122	{
47			123	std::shared_ptr<mgm::InternalNativeDisplay> native_display = nullptr;
48			124	std::mutex native_display_guard;
49			125	}
50			126
51			127	bool mgm::NativePlatform::internal_native_display_in_use()
52			128	{
53			129	std::unique_lock<std::mutex> lg(native_display_guard);
54			130	return native_display != nullptr;
55			131	}
56			132
57			133	std::shared_ptr<mgm::InternalNativeDisplay> mgm::NativePlatform::internal_native_display()
58			134	{
59			135	std::unique_lock<std::mutex> lg(native_display_guard);
60			136	return native_display;
61			137	}
62			138
63			139	std::shared_ptr<mgm::InternalNativeDisplay> mgm::NativePlatform::ensure_internal_native_display(
64			140	std::shared_ptr<mg::PlatformIPCPackage> const& package)
65			141	{
66			142	std::unique_lock<std::mutex> lg(native_display_guard);
67			143	if (!native_display)
68			144	native_display = std::make_shared<mgm::InternalNativeDisplay>(package);
69			145	return native_display;
70			146	}
71			147
72			148	void mgm::NativePlatform::finish_internal_native_display()
73			149	{
74			150	std::unique_lock<std::mutex> lg(native_display_guard);
75			151	native_display.reset();
76			152	}
77			153
78	109		154
79	=== modified file 'src/platform/graphics/mesa/native_platform.h'
80	--- src/platform/graphics/mesa/native_platform.h 2014-03-06 06:05:17 +0000
81	+++ src/platform/graphics/mesa/native_platform.h 2014-03-12 02:47:17 +0000
82	@@ -30,20 +30,30 @@
83	30	{	30	{
84	31	namespace mesa	31	namespace mesa
85	32	{	32	{
86			33	class InternalNativeDisplay;
87			34
88	33	class NativePlatform : public graphics::NativePlatform	35	class NativePlatform : public graphics::NativePlatform
89	34	{	36	{
90	35	public:	37	public:
91			38	virtual ~NativePlatform();
92			39
93	36	void initialize(std::shared_ptr<NestedContext> const& nested_context);	40	void initialize(std::shared_ptr<NestedContext> const& nested_context);
94	37	std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(	41	std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
95	38	std::shared_ptr<BufferInitializer> const& buffer_initializer) override;	42	std::shared_ptr<BufferInitializer> const& buffer_initializer) override;
96	39	std::shared_ptr<PlatformIPCPackage> get_ipc_package() override;	43	std::shared_ptr<PlatformIPCPackage> get_ipc_package() override;
97	40	std::shared_ptr<InternalClient> create_internal_client() override;	44	std::shared_ptr<InternalClient> create_internal_client() override;
98	41	void fill_ipc_package(BufferIPCPacker* packer, Buffer const* buffer) const override;	45	void fill_ipc_package(BufferIPCPacker* packer, Buffer const* buffer) const override;
99			46
100			47	static std::shared_ptr<InternalNativeDisplay> internal_native_display();
101			48	static bool internal_native_display_in_use();
102	42		49
103	43	private:	50	private:
104	44	int drm_fd;	51	int drm_fd;
105	45	std::shared_ptr<NestedContext> nested_context;	52	std::shared_ptr<NestedContext> nested_context;
106	46	helpers::GBMHelper gbm;	53	helpers::GBMHelper gbm;
107			54
108			55	static std::shared_ptr<InternalNativeDisplay> ensure_internal_native_display(std::shared_ptr<PlatformIPCPackage> const& package);
109			56	static void finish_internal_native_display();
110	47	};	57	};
111	48	}	58	}
112	49	}	59	}
113	50		60
114	=== modified file 'src/platform/graphics/mesa/platform.cpp'
115	--- src/platform/graphics/mesa/platform.cpp 2014-03-06 06:05:17 +0000
116	+++ src/platform/graphics/mesa/platform.cpp 2014-03-12 02:47:17 +0000
117	@@ -17,6 +17,7 @@
118	17	*/	17	*/
119	18		18
120	19	#include "platform.h"	19	#include "platform.h"
121			20	#include "native_platform.h"
122	20	#include "buffer_allocator.h"	21	#include "buffer_allocator.h"
123	21	#include "display.h"	22	#include "display.h"
124	22	#include "internal_client.h"	23	#include "internal_client.h"
125	@@ -179,6 +180,12 @@
126	179		180
127	180	extern "C" int mir_server_mesa_egl_native_display_is_valid(MirMesaEGLNativeDisplay* display)	181	extern "C" int mir_server_mesa_egl_native_display_is_valid(MirMesaEGLNativeDisplay* display)
128	181	{	182	{
131	182	return ((mgm::Platform::internal_display_clients_present) &&	183	bool nested_internal_display_in_use = mgm::NativePlatform::internal_native_display_in_use();
132	183	(display == mgm::Platform::internal_native_display.get()));	184	bool host_internal_display_in_use = mgm::Platform::internal_display_clients_present;
133			185
134			186	if (host_internal_display_in_use)
135			187	return (display == mgm::Platform::internal_native_display.get());
136			188	else if (nested_internal_display_in_use)
137			189	return (display == mgm::NativePlatform::internal_native_display().get());
138			190	return 0;
139	184	}	191	}