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

shaped-texture: Use the cogl helper methods for fetching shm_buffer contents

Browse Source 
Rather than doing the set_region ourselves.
This commit is contained in:
Jasper St. Pierre 2013-11-14 15:41:59 -05:00
parent bbbb9ac53c
commit 735b736110
1 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/compositor/meta-shaped-texture.c
View File

@ -678,40 +678,9 @@ wayland_surface_update_area (MetaShapedTexture *stex,
struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get (resource); struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get (resource);
if (shm_buffer) if (shm_buffer)
{ cogl_wayland_texture_2d_update_area (COGL_TEXTURE_2D (priv->texture),
CoglPixelFormat format; shm_buffer,
x, y, width, height);
switch (wl_shm_buffer_get_format (shm_buffer))
{
#if G_BYTE_ORDER == G_BIG_ENDIAN
case WL_SHM_FORMAT_ARGB8888:
format = COGL_PIXEL_FORMAT_ARGB_8888_PRE;
break;
case WL_SHM_FORMAT_XRGB8888:
format = COGL_PIXEL_FORMAT_ARGB_8888;
break;
#elif G_BYTE_ORDER == G_LITTLE_ENDIAN
case WL_SHM_FORMAT_ARGB8888:
format = COGL_PIXEL_FORMAT_BGRA_8888_PRE;
break;
case WL_SHM_FORMAT_XRGB8888:
format = COGL_PIXEL_FORMAT_BGRA_8888;
break;
#endif
default:
g_warn_if_reached ();
format = COGL_PIXEL_FORMAT_ARGB_8888;
}
cogl_texture_set_region (priv->texture,
x, y,
x, y,
width, height,
width, height,
format,
wl_shm_buffer_get_stride (shm_buffer),
wl_shm_buffer_get_data (shm_buffer));
}
} }
} }