isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updates in line with latest wayland protocol

Browse Source 
The shm buffer format enum values were renamed and the explicitly
premultiplied format was dropped since it's now assumed if the buffer
has an alpha component then it's premultiplied.
This commit is contained in:
Robert Bragg 2012-01-12 20:24:48 +00:00
parent 2a6d93dfd2
commit 50d1285ba1
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cogl/cogl-texture-2d.c
View File

@ -507,24 +507,18 @@ cogl_wayland_texture_2d_new_from_buffer (CoglContext *ctx,
switch (wl_shm_buffer_get_format (buffer)) switch (wl_shm_buffer_get_format (buffer))
{ {
#if G_BYTE_ORDER == G_BIG_ENDIAN #if G_BYTE_ORDER == G_BIG_ENDIAN
case WL_SHM_FORMAT_PREMULTIPLIED_ARGB32: case WL_SHM_FORMAT_ARGB8888:
format = COGL_PIXEL_FORMAT_ARGB_8888_PRE; format = COGL_PIXEL_FORMAT_ARGB_8888_PRE;
break; break;
case WL_SHM_FORMAT_ARGB32:
format = COGL_PIXEL_FORMAT_ARGB_8888;
break;
case WL_SHM_FORMAT_XRGB32: case WL_SHM_FORMAT_XRGB32:
format = COGL_PIXEL_FORMAT_ARGB_8888; format = COGL_PIXEL_FORMAT_ARGB_8888;
internal_format = COGL_PIXEL_FORMAT_RGB_888; internal_format = COGL_PIXEL_FORMAT_RGB_888;
break; break;
#elif G_BYTE_ORDER == G_LITTLE_ENDIAN #elif G_BYTE_ORDER == G_LITTLE_ENDIAN
case WL_SHM_FORMAT_PREMULTIPLIED_ARGB32: case WL_SHM_FORMAT_ARGB8888:
format = COGL_PIXEL_FORMAT_BGRA_8888_PRE; format = COGL_PIXEL_FORMAT_BGRA_8888_PRE;
break; break;
case WL_SHM_FORMAT_ARGB32: case WL_SHM_FORMAT_XRGB8888:
format = COGL_PIXEL_FORMAT_BGRA_8888;
break;
case WL_SHM_FORMAT_XRGB32:
format = COGL_PIXEL_FORMAT_BGRA_8888; format = COGL_PIXEL_FORMAT_BGRA_8888;
internal_format = COGL_PIXEL_FORMAT_BGR_888; internal_format = COGL_PIXEL_FORMAT_BGR_888;
break; break;

10
examples/cogland.c
View File

@ -198,19 +198,17 @@ shm_buffer_damaged (struct wl_buffer *wayland_buffer,
switch (wl_shm_buffer_get_format (wayland_buffer)) switch (wl_shm_buffer_get_format (wayland_buffer))
{ {
#if G_BYTE_ORDER == G_BIG_ENDIAN #if G_BYTE_ORDER == G_BIG_ENDIAN
case WL_SHM_FORMAT_PREMULTIPLIED_ARGB32: case WL_SHM_FORMAT_ARGB8888:
format = COGL_PIXEL_FORMAT_ARGB_8888_PRE; format = COGL_PIXEL_FORMAT_ARGB_8888_PRE;
break; break;
case WL_SHM_FORMAT_ARGB32: case WL_SHM_FORMAT_XRGB8888:
case WL_SHM_FORMAT_XRGB32:
format = COGL_PIXEL_FORMAT_ARGB_8888; format = COGL_PIXEL_FORMAT_ARGB_8888;
break; break;
#elif G_BYTE_ORDER == G_LITTLE_ENDIAN #elif G_BYTE_ORDER == G_LITTLE_ENDIAN
case WL_SHM_FORMAT_PREMULTIPLIED_ARGB32: case WL_SHM_FORMAT_ARGB8888:
format = COGL_PIXEL_FORMAT_BGRA_8888_PRE; format = COGL_PIXEL_FORMAT_BGRA_8888_PRE;
break; break;
case WL_SHM_FORMAT_ARGB32: case WL_SHM_FORMAT_XRGB8888:
case WL_SHM_FORMAT_XRGB32:
format = COGL_PIXEL_FORMAT_BGRA_8888; format = COGL_PIXEL_FORMAT_BGRA_8888;
break; break;
#endif #endif