1
=== modified file 'examples/eglapp.c'
2
--- examples/eglapp.c	2013-10-07 09:21:27 +0000
3
+++ examples/eglapp.c	2013-11-18 10:07:45 +0000
4
@@ -300,12 +300,11 @@
5
300
300
6
301
    const MirDisplayMode *mode = &output->modes[output->current_mode];
301
    const MirDisplayMode *mode = &output->modes[output->current_mode];
7
302
302
10
303
    const unsigned int max_formats = 10;
303
    unsigned int format[mir_pixel_formats];
9
304
    unsigned int format[max_formats];
11
305
    unsigned int nformats;
304
    unsigned int nformats;
12
306
305
13
307
    mir_connection_get_available_surface_formats(connection,
306
    mir_connection_get_available_surface_formats(connection,
15
308
        format, max_formats, &nformats);
307
        format, mir_pixel_formats, &nformats);
16
309
308
17
310
    surfaceparm.pixel_format = format[0];
309
    surfaceparm.pixel_format = format[0];
18
311
    for (unsigned int f = 0; f < nformats; f++)
310
    for (unsigned int f = 0; f < nformats; f++)
19
@@ -322,18 +321,17 @@
20
322
        }
321
        }
21
323
    }
322
    }
22
324
323
25
325
    printf("Connected to display: resolution (%dx%d), position(%dx%d), "
324
    printf("Current active output is %dx%d %+d%+d\n",
24
326
           "supports %d pixel formats\n",
26
327
           mode->horizontal_resolution, mode->vertical_resolution,
325
           mode->horizontal_resolution, mode->vertical_resolution,
29
328
           output->position_x, output->position_y,
326
           output->position_x, output->position_y);
28
329
           output->num_output_formats);
30
330
327
31
331
    surfaceparm.width = *width > 0 ? *width : mode->horizontal_resolution;
328
    surfaceparm.width = *width > 0 ? *width : mode->horizontal_resolution;
32
332
    surfaceparm.height = *height > 0 ? *height : mode->vertical_resolution;
329
    surfaceparm.height = *height > 0 ? *height : mode->vertical_resolution;
33
333
330
34
334
    mir_display_config_destroy(display_config);
331
    mir_display_config_destroy(display_config);
35
335
332
37
336
    printf("Using pixel format #%d\n", surfaceparm.pixel_format);
333
    printf("Server supports %d of %d surface pixel formats. Using format: %d\n",
38
334
        nformats, mir_pixel_formats, surfaceparm.pixel_format);
39
337
    unsigned int bpp = get_bpp(surfaceparm.pixel_format);
335
    unsigned int bpp = get_bpp(surfaceparm.pixel_format);
40
338
    EGLint attribs[] =
336
    EGLint attribs[] =
41
339
    {
337
    {
42
340
338
43
=== modified file 'include/shared/mir_toolkit/client_types.h'
44
--- include/shared/mir_toolkit/client_types.h	2013-09-12 21:36:55 +0000
45
+++ include/shared/mir_toolkit/client_types.h	2013-11-18 10:07:45 +0000
46
@@ -112,7 +112,8 @@
47
112
    mir_pixel_format_xbgr_8888,
112
    mir_pixel_format_xbgr_8888,
48
113
    mir_pixel_format_argb_8888,
113
    mir_pixel_format_argb_8888,
49
114
    mir_pixel_format_xrgb_8888,
114
    mir_pixel_format_xrgb_8888,
51
115
    mir_pixel_format_bgr_888
115
    mir_pixel_format_bgr_888,
52
116
    mir_pixel_formats
53
116
} MirPixelFormat;
117
} MirPixelFormat;
54
117
118
55
118
/**
119
/**
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-19
Kevin DuBois (community)			Approve on 2013-11-18
Alan Griffiths		2013-11-18	Approve on 2013-11-18
Review via email: mp+195568@code.launchpad.net