brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: really fix buffer format selection

Browse Source 
Wayland visuals refer to a pixel's bytes in order from
most significant to least significant, while the
one-byte-per-component Cogl formats refer to the order
of increasing memory addresses, so converting between
the two depends on the system's endianness.
This commit is contained in:
nobled 2011-01-31 02:45:01 +00:00
parent 2ff5cf5aa0
commit 15cd4705db
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
clutter/wayland/clutter-stage-wayland.c
View File

@ -59,6 +59,32 @@ G_DEFINE_TYPE_WITH_CODE (ClutterStageWayland,
G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_STAGE_WINDOW, G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_STAGE_WINDOW,
clutter_stage_window_iface_init)); clutter_stage_window_iface_init));
#if G_BYTE_ORDER == G_BIG_ENDIAN
#define VISUAL_ARGB_PRE COGL_PIXEL_FORMAT_ARGB_8888_PRE
#define VISUAL_ARGB COGL_PIXEL_FORMAT_ARGB_8888
#define VISUAL_RGB COGL_PIXEL_FORMAT_RGB_888
#elif G_BYTE_ORDER == G_LITTLE_ENDIAN
#define VISUAL_ARGB_PRE COGL_PIXEL_FORMAT_BGRA_8888_PRE
#define VISUAL_ARGB COGL_PIXEL_FORMAT_BGRA_8888
#define VISUAL_RGB COGL_PIXEL_FORMAT_BGR_888
#endif
static struct wl_visual *
get_visual (struct wl_display *display, CoglPixelFormat format)
{
switch (format)
{
case VISUAL_ARGB_PRE:
return wl_display_get_premultiplied_argb_visual (display);
case VISUAL_ARGB:
return wl_display_get_argb_visual (display);
case VISUAL_RGB:
return wl_display_get_rgb_visual (display);
default:
return NULL;
}
}
static ClutterStageWaylandWaylandBuffer * static ClutterStageWaylandWaylandBuffer *
wayland_create_buffer (ClutterGeometry *geom) wayland_create_buffer (ClutterGeometry *geom)
{ {
@ -93,13 +119,12 @@ wayland_create_buffer (ClutterGeometry *geom)
geom->height, geom->height,
0, 0,
0, 0,
COGL_PIXEL_FORMAT_ARGB_8888_PRE); VISUAL_ARGB_PRE);
buffer->offscreen = cogl_offscreen_new_to_texture (buffer->tex); buffer->offscreen = cogl_offscreen_new_to_texture (buffer->tex);
backend_wayland->export_drm_image (edpy, buffer->drm_image, backend_wayland->export_drm_image (edpy, buffer->drm_image,
&name, NULL, &stride); &name, NULL, &stride);
visual = visual = get_visual (backend_wayland->wayland_display, VISUAL_ARGB_PRE);
wl_display_get_premultiplied_argb_visual (backend_wayland->wayland_display);
buffer->wayland_buffer = buffer->wayland_buffer =
wl_drm_create_buffer (backend_wayland->wayland_drm, wl_drm_create_buffer (backend_wayland->wayland_drm,
name, name,