1
=== modified file 'src/platforms/android/server/hwc_blanking_control.cpp'
2
--- src/platforms/android/server/hwc_blanking_control.cpp	2016-01-29 08:18:22 +0000
3
+++ src/platforms/android/server/hwc_blanking_control.cpp	2016-06-22 22:51:59 +0000
4
@@ -28,6 +28,9 @@
5
28
#include <system_error>
28
#include <system_error>
6
29
#include <chrono>
29
#include <chrono>
7
30
30
8
31
#define MIR_LOG_COMPONENT "android/server"
9
32
#include "mir/log.h"
10
33
11
31
namespace mg = mir::graphics;
34
namespace mg = mir::graphics;
12
32
namespace mga = mir::graphics::android;
35
namespace mga = mir::graphics::android;
13
33
namespace geom = mir::geometry;
36
namespace geom = mir::geometry;
14
@@ -41,6 +44,10 @@
15
41
        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
44
        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
16
42
        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
45
        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
17
43
        EGL_FRAMEBUFFER_TARGET_ANDROID, EGL_TRUE,
46
        EGL_FRAMEBUFFER_TARGET_ANDROID, EGL_TRUE,
18
47
        EGL_RECORDABLE_ANDROID, EGL_TRUE,
19
48
        EGL_RED_SIZE, 8,
20
49
        EGL_GREEN_SIZE, 8,
21
50
        EGL_BLUE_SIZE, 8,
22
44
        EGL_NONE
51
        EGL_NONE
23
45
    };
52
    };
24
46
53
25
@@ -57,14 +64,19 @@
26
57
        int visual_id;
64
        int visual_id;
27
58
        eglGetConfigAttrib(egl_display, fb_egl_config, EGL_NATIVE_VISUAL_ID, &visual_id);
65
        eglGetConfigAttrib(egl_display, fb_egl_config, EGL_NATIVE_VISUAL_ID, &visual_id);
28
59
        fb_format = mga::to_mir_format(visual_id);
66
        fb_format = mga::to_mir_format(visual_id);
29
67
        mir::log_info("Found %d matching egl configs", matching_configs);
30
68
        mir::log_info("Android visual ID for selected display format : %d", visual_id);
31
60
    }
69
    }
32
61
    else
70
    else
33
62
    {
71
    {
34
72
        mir::log_info("No matching egl configs found");
35
63
        //we couldn't figure out the fb format via egl. In this case, we
73
        //we couldn't figure out the fb format via egl. In this case, we
36
64
        //assume abgr_8888. HWC api really should provide this information directly.
74
        //assume abgr_8888. HWC api really should provide this information directly.
37
65
        fb_format = mir_pixel_format_abgr_8888;
75
        fb_format = mir_pixel_format_abgr_8888;
38
66
    }
76
    }
39
67
77
40
78
    mir::log_info("Selected Mir display format : %d", fb_format);
41
79
42
68
    eglTerminate(egl_display);
80
    eglTerminate(egl_display);
43
69
    return fb_format;
81
    return fb_format;
44
70
}
82
}
45
71
83
46
=== modified file 'tests/unit-tests/graphics/android/test_hwc_configuration.cpp'
47
--- tests/unit-tests/graphics/android/test_hwc_configuration.cpp	2015-06-25 03:00:08 +0000
48
+++ tests/unit-tests/graphics/android/test_hwc_configuration.cpp	2016-06-22 22:51:59 +0000
49
@@ -41,11 +41,16 @@
50
41
{
41
{
51
42
    using namespace testing;
42
    using namespace testing;
52
43
    Mock::VerifyAndClearExpectations(&mock_egl);
43
    Mock::VerifyAndClearExpectations(&mock_egl);
53
44
    // Should match what's in determine_hwc_fb_format() in hwc_blanking_control.cpp
54
44
    EGLint const expected_egl_config_attr [] =
45
    EGLint const expected_egl_config_attr [] =
55
45
    {
46
    {
56
46
        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
47
        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
57
47
        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
48
        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
58
48
        EGL_FRAMEBUFFER_TARGET_ANDROID, EGL_TRUE,
49
        EGL_FRAMEBUFFER_TARGET_ANDROID, EGL_TRUE,
59
50
        EGL_RECORDABLE_ANDROID, EGL_TRUE,
60
51
        EGL_RED_SIZE, 8,
61
52
        EGL_GREEN_SIZE, 8,
62
53
        EGL_BLUE_SIZE, 8,
63
49
        EGL_NONE
54
        EGL_NONE
64
50
    };
55
    };
65
51
56
Status:	Merged
Approved by:	Cemil Azizoglu on 2016-06-23
Approved revision:	no longer in the source branch.
Merged at revision:	3552
Proposed branch:	lp:~cemil-azizoglu/mir/refine-display-format-selection-on-android
Merge into:	lp:mir
Diff against target:	64 lines (+17/-0) 2 files modified src/platforms/android/server/hwc_blanking_control.cpp (+12/-0) tests/unit-tests/graphics/android/test_hwc_configuration.cpp (+5/-0)
To merge this branch:	bzr merge lp:~cemil-azizoglu/mir/refine-display-format-selection-on-android
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-06-24
Kevin DuBois (community)			Approve on 2016-06-23
Alexandros Frantzis (community)		2016-06-22	Approve on 2016-06-23
Review via email: mp+298176@code.launchpad.net