1
=== modified file 'src/platform/graphics/android/buffer.cpp'
2
--- src/platform/graphics/android/buffer.cpp	2013-12-18 02:19:19 +0000
3
+++ src/platform/graphics/android/buffer.cpp	2014-01-08 16:28:01 +0000
4
@@ -42,14 +42,13 @@
5
42
42
6
43
mga::Buffer::~Buffer()
43
mga::Buffer::~Buffer()
7
44
{
44
{
10
45
    std::map<EGLDisplay,EGLImageKHR>::iterator it;
45
    for(auto& it : egl_image_map)
9
46
    for(it = egl_image_map.begin(); it != egl_image_map.end(); it++)
11
47
    {
46
    {
13
48
        egl_extensions->eglDestroyImageKHR(it->first, it->second);
47
        EGLDisplay disp = it.first.first;
14
48
        egl_extensions->eglDestroyImageKHR(disp, it.second);
15
49
    }
49
    }
16
50
}
50
}
17
51
51
18
52
19
53
geom::Size mga::Buffer::size() const
52
geom::Size mga::Buffer::size() const
20
54
{
53
{
21
55
    ANativeWindowBuffer *anwb = native_buffer->anwb();
54
    ANativeWindowBuffer *anwb = native_buffer->anwb();
22
@@ -79,26 +78,36 @@
23
79
    std::unique_lock<std::mutex> lk(content_lock);
78
    std::unique_lock<std::mutex> lk(content_lock);
24
80
    native_buffer->wait_for_content();
79
    native_buffer->wait_for_content();
25
81
80
28
82
    EGLDisplay disp = eglGetCurrentDisplay();
81
    DispContextPair current
29
83
    if (disp == EGL_NO_DISPLAY) {
82
    {
30
83
        eglGetCurrentDisplay(),
31
84
        eglGetCurrentContext()
32
85
    };
33
86
34
87
    if (current.first == EGL_NO_DISPLAY)
35
88
    {
36
84
        BOOST_THROW_EXCEPTION(std::runtime_error("cannot bind buffer to texture without EGL context\n"));
89
        BOOST_THROW_EXCEPTION(std::runtime_error("cannot bind buffer to texture without EGL context\n"));
37
85
    }
90
    }
38
91
39
86
    static const EGLint image_attrs[] =
92
    static const EGLint image_attrs[] =
40
87
    {
93
    {
41
88
        EGL_IMAGE_PRESERVED_KHR, EGL_TRUE,
94
        EGL_IMAGE_PRESERVED_KHR, EGL_TRUE,
42
89
        EGL_NONE
95
        EGL_NONE
43
90
    };
96
    };
44
97
45
91
    EGLImageKHR image;
98
    EGLImageKHR image;
47
92
    auto it = egl_image_map.find(disp);
99
    auto it = egl_image_map.find(current);
48
93
    if (it == egl_image_map.end())
100
    if (it == egl_image_map.end())
49
94
    {
101
    {
52
95
        image = egl_extensions->eglCreateImageKHR(disp, EGL_NO_CONTEXT, EGL_NATIVE_BUFFER_ANDROID,
102
        image = egl_extensions->eglCreateImageKHR(
53
96
                                  native_buffer->anwb(), image_attrs);
103
                    current.first, EGL_NO_CONTEXT, EGL_NATIVE_BUFFER_ANDROID,
54
104
                    native_buffer->anwb(), image_attrs);
55
105
56
97
        if (image == EGL_NO_IMAGE_KHR)
106
        if (image == EGL_NO_IMAGE_KHR)
57
98
        {
107
        {
58
99
            BOOST_THROW_EXCEPTION(std::runtime_error("error binding buffer to texture\n"));
108
            BOOST_THROW_EXCEPTION(std::runtime_error("error binding buffer to texture\n"));
59
100
        }
109
        }
61
101
        egl_image_map[disp] = image;
110
        egl_image_map[current] = image;
62
102
    }
111
    }
63
103
    else /* already had it in map */
112
    else /* already had it in map */
64
104
    {
113
    {
65
105
114
66
=== modified file 'src/platform/graphics/android/buffer.h'
67
--- src/platform/graphics/android/buffer.h	2013-12-18 02:19:19 +0000
68
+++ src/platform/graphics/android/buffer.h	2014-01-08 16:28:01 +0000
69
@@ -58,10 +58,10 @@
70
58
    std::shared_ptr<NativeBuffer> native_buffer_handle() const;
58
    std::shared_ptr<NativeBuffer> native_buffer_handle() const;
71
59
59
72
60
private:
60
private:
73
61
    typedef std::pair<EGLDisplay, EGLContext> DispContextPair;
74
62
    std::map<DispContextPair,EGLImageKHR> egl_image_map;
75
63
76
61
    std::mutex mutable content_lock;
64
    std::mutex mutable content_lock;
77
62
78
63
    std::map<EGLDisplay,EGLImageKHR> egl_image_map;
79
64
80
65
    std::shared_ptr<NativeBuffer> native_buffer;
65
    std::shared_ptr<NativeBuffer> native_buffer;
81
66
    std::shared_ptr<EGLExtensions> egl_extensions;
66
    std::shared_ptr<EGLExtensions> egl_extensions;
82
67
};
67
};
83
68
68
84
=== modified file 'tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp'
85
--- tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp	2013-12-18 02:19:19 +0000
86
+++ tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp	2014-01-08 16:28:01 +0000
87
@@ -349,3 +349,37 @@
88
349
    mga::Buffer buffer(mock_native_buffer, extensions);
349
    mga::Buffer buffer(mock_native_buffer, extensions);
89
350
    buffer.bind_to_texture();
350
    buffer.bind_to_texture();
90
351
}
351
}
91
352
92
353
TEST_F(AndroidBufferBinding, different_egl_contexts_displays_generate_new_eglimages)
93
354
{
94
355
    using namespace testing;
95
356
96
357
    int d1 = 0, d2 = 0, c1 = 0, c2 = 0;
97
358
    EGLDisplay disp1 = reinterpret_cast<EGLDisplay>(&d1);
98
359
    EGLDisplay disp2 = reinterpret_cast<EGLDisplay>(&d2);
99
360
    EGLContext ctxt1 = reinterpret_cast<EGLContext>(&c1);
100
361
    EGLContext ctxt2 = reinterpret_cast<EGLContext>(&c2);
101
362
102
363
    EXPECT_CALL(mock_egl, eglGetCurrentDisplay())
103
364
        .Times(3)
104
365
        .WillOnce(Return(disp1))
105
366
        .WillOnce(Return(disp1))
106
367
        .WillOnce(Return(disp2));
107
368
108
369
    EXPECT_CALL(mock_egl, eglGetCurrentContext())
109
370
        .Times(3)
110
371
        .WillOnce(Return(ctxt1))
111
372
        .WillRepeatedly(Return(ctxt2));
112
373
113
374
    EXPECT_CALL(mock_egl, eglCreateImageKHR(disp1,_,_,_,_))
114
375
        .Times(2);
115
376
    EXPECT_CALL(mock_egl, eglCreateImageKHR(disp2,_,_,_,_))
116
377
        .Times(1);
117
378
    EXPECT_CALL(mock_egl, eglDestroyImageKHR(_,_))
118
379
        .Times(Exactly(3));
119
380
120
381
    mga::Buffer buffer(mock_native_buffer, extensions);
121
382
    buffer.bind_to_texture();
122
383
    buffer.bind_to_texture();
123
384
    buffer.bind_to_texture();
124
385
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-01-08	Approve on 2014-01-08
Gerry Boland (community)	functional		Approve on 2014-01-08
Andreas Pokorny (community)			Approve on 2014-01-08
Alan Griffiths			Needs Fixing on 2014-01-08
Alexandros Frantzis (community)			Approve on 2014-01-08
Daniel van Vugt			Approve on 2014-01-08
Kevin DuBois			Pending
Review via email: mp+200754@code.launchpad.net
1	=== modified file 'src/platform/graphics/android/buffer.cpp'
2	--- src/platform/graphics/android/buffer.cpp 2013-12-18 02:19:19 +0000
3	+++ src/platform/graphics/android/buffer.cpp 2014-01-08 16:28:01 +0000
4	@@ -42,14 +42,13 @@
5	42		42
6	43	mga::Buffer::~Buffer()	43	mga::Buffer::~Buffer()
7	44	{	44	{
10	45	std::map<EGLDisplay,EGLImageKHR>::iterator it;	45	for(auto& it : egl_image_map)
9	46	for(it = egl_image_map.begin(); it != egl_image_map.end(); it++)
11	47	{	46	{
13	48	egl_extensions->eglDestroyImageKHR(it->first, it->second);	47	EGLDisplay disp = it.first.first;
14			48	egl_extensions->eglDestroyImageKHR(disp, it.second);
15	49	}	49	}
16	50	}	50	}
17	51		51
18	52
19	53	geom::Size mga::Buffer::size() const	52	geom::Size mga::Buffer::size() const
20	54	{	53	{
21	55	ANativeWindowBuffer *anwb = native_buffer->anwb();	54	ANativeWindowBuffer *anwb = native_buffer->anwb();
22	@@ -79,26 +78,36 @@
23	79	std::unique_lock<std::mutex> lk(content_lock);	78	std::unique_lock<std::mutex> lk(content_lock);
24	80	native_buffer->wait_for_content();	79	native_buffer->wait_for_content();
25	81		80
28	82	EGLDisplay disp = eglGetCurrentDisplay();	81	DispContextPair current
29	83	if (disp == EGL_NO_DISPLAY) {	82	{
30			83	eglGetCurrentDisplay(),
31			84	eglGetCurrentContext()
32			85	};
33			86
34			87	if (current.first == EGL_NO_DISPLAY)
35			88	{
36	84	BOOST_THROW_EXCEPTION(std::runtime_error("cannot bind buffer to texture without EGL context\n"));	89	BOOST_THROW_EXCEPTION(std::runtime_error("cannot bind buffer to texture without EGL context\n"));
37	85	}	90	}
38			91
39	86	static const EGLint image_attrs[] =	92	static const EGLint image_attrs[] =
40	87	{	93	{
41	88	EGL_IMAGE_PRESERVED_KHR, EGL_TRUE,	94	EGL_IMAGE_PRESERVED_KHR, EGL_TRUE,
42	89	EGL_NONE	95	EGL_NONE
43	90	};	96	};
44			97
45	91	EGLImageKHR image;	98	EGLImageKHR image;
47	92	auto it = egl_image_map.find(disp);	99	auto it = egl_image_map.find(current);
48	93	if (it == egl_image_map.end())	100	if (it == egl_image_map.end())
49	94	{	101	{
52	95	image = egl_extensions->eglCreateImageKHR(disp, EGL_NO_CONTEXT, EGL_NATIVE_BUFFER_ANDROID,	102	image = egl_extensions->eglCreateImageKHR(
53	96	native_buffer->anwb(), image_attrs);	103	current.first, EGL_NO_CONTEXT, EGL_NATIVE_BUFFER_ANDROID,
54			104	native_buffer->anwb(), image_attrs);
55			105
56	97	if (image == EGL_NO_IMAGE_KHR)	106	if (image == EGL_NO_IMAGE_KHR)
57	98	{	107	{
58	99	BOOST_THROW_EXCEPTION(std::runtime_error("error binding buffer to texture\n"));	108	BOOST_THROW_EXCEPTION(std::runtime_error("error binding buffer to texture\n"));
59	100	}	109	}
61	101	egl_image_map[disp] = image;	110	egl_image_map[current] = image;
62	102	}	111	}
63	103	else /* already had it in map */	112	else /* already had it in map */
64	104	{	113	{
65	105		114
66	=== modified file 'src/platform/graphics/android/buffer.h'
67	--- src/platform/graphics/android/buffer.h 2013-12-18 02:19:19 +0000
68	+++ src/platform/graphics/android/buffer.h 2014-01-08 16:28:01 +0000
69	@@ -58,10 +58,10 @@
70	58	std::shared_ptr<NativeBuffer> native_buffer_handle() const;	58	std::shared_ptr<NativeBuffer> native_buffer_handle() const;
71	59		59
72	60	private:	60	private:
73			61	typedef std::pair<EGLDisplay, EGLContext> DispContextPair;
74			62	std::map<DispContextPair,EGLImageKHR> egl_image_map;
75			63
76	61	std::mutex mutable content_lock;	64	std::mutex mutable content_lock;
77	62
78	63	std::map<EGLDisplay,EGLImageKHR> egl_image_map;
79	64
80	65	std::shared_ptr<NativeBuffer> native_buffer;	65	std::shared_ptr<NativeBuffer> native_buffer;
81	66	std::shared_ptr<EGLExtensions> egl_extensions;	66	std::shared_ptr<EGLExtensions> egl_extensions;
82	67	};	67	};
83	68		68
84	=== modified file 'tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp'
85	--- tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp 2013-12-18 02:19:19 +0000
86	+++ tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp 2014-01-08 16:28:01 +0000
87	@@ -349,3 +349,37 @@
88	349	mga::Buffer buffer(mock_native_buffer, extensions);	349	mga::Buffer buffer(mock_native_buffer, extensions);
89	350	buffer.bind_to_texture();	350	buffer.bind_to_texture();
90	351	}	351	}
91			352
92			353	TEST_F(AndroidBufferBinding, different_egl_contexts_displays_generate_new_eglimages)
93			354	{
94			355	using namespace testing;
95			356
96			357	int d1 = 0, d2 = 0, c1 = 0, c2 = 0;
97			358	EGLDisplay disp1 = reinterpret_cast<EGLDisplay>(&d1);
98			359	EGLDisplay disp2 = reinterpret_cast<EGLDisplay>(&d2);
99			360	EGLContext ctxt1 = reinterpret_cast<EGLContext>(&c1);
100			361	EGLContext ctxt2 = reinterpret_cast<EGLContext>(&c2);
101			362
102			363	EXPECT_CALL(mock_egl, eglGetCurrentDisplay())
103			364	.Times(3)
104			365	.WillOnce(Return(disp1))
105			366	.WillOnce(Return(disp1))
106			367	.WillOnce(Return(disp2));
107			368
108			369	EXPECT_CALL(mock_egl, eglGetCurrentContext())
109			370	.Times(3)
110			371	.WillOnce(Return(ctxt1))
111			372	.WillRepeatedly(Return(ctxt2));
112			373
113			374	EXPECT_CALL(mock_egl, eglCreateImageKHR(disp1,_,_,_,_))
114			375	.Times(2);
115			376	EXPECT_CALL(mock_egl, eglCreateImageKHR(disp2,_,_,_,_))
116			377	.Times(1);
117			378	EXPECT_CALL(mock_egl, eglDestroyImageKHR(_,_))
118			379	.Times(Exactly(3));
119			380
120			381	mga::Buffer buffer(mock_native_buffer, extensions);
121			382	buffer.bind_to_texture();
122			383	buffer.bind_to_texture();
123			384	buffer.bind_to_texture();
124			385	}