isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 03:20:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "cogl-texture-2d: Add update_area equivalent for Wayland"

Browse Source 
This patch was accidentally added before it had any review and without
first going through master. Master now has a replacement patch with
some modifications. That will be cherry-picked to the 1.18 branch in a
subsequent commit.

This reverts commit af480a2b8b.
This commit is contained in:
Neil Roberts 2013-11-28 14:28:29 +00:00
parent c5644723f8
commit 5ef1020e8a
2 changed files with 25 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,13 +293,22 @@ _cogl_egl_texture_2d_new_from_image (CoglContext *ctx,
#endif /* defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base) */ #endif /* defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base) */
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT #ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
static void CoglTexture2D *
shm_buffer_get_cogl_pixel_format (struct wl_shm_buffer *shm_buffer, cogl_wayland_texture_2d_new_from_buffer (CoglContext *ctx,
CoglPixelFormat *format_out, struct wl_resource *buffer,
CoglPixelFormat *internal_format_out) CoglError **error)
{ {
struct wl_shm_buffer *shm_buffer;
shm_buffer = wl_shm_buffer_get (buffer);
if (shm_buffer)
{
int stride = wl_shm_buffer_get_stride (shm_buffer);
CoglPixelFormat format; CoglPixelFormat format;
CoglPixelFormat internal_format = COGL_PIXEL_FORMAT_ANY; CoglPixelFormat internal_format = COGL_PIXEL_FORMAT_ANY;
int width = wl_shm_buffer_get_width (shm_buffer);
int height = wl_shm_buffer_get_height (shm_buffer);
switch (wl_shm_buffer_get_format (shm_buffer)) switch (wl_shm_buffer_get_format (shm_buffer))
{ {
@ -325,52 +334,6 @@ shm_buffer_get_cogl_pixel_format (struct wl_shm_buffer *shm_buffer,
format = COGL_PIXEL_FORMAT_ARGB_8888; format = COGL_PIXEL_FORMAT_ARGB_8888;
} }
if (format_out)
*format_out = format;
if (internal_format_out)
*internal_format_out = internal_format;
}
void
cogl_wayland_texture_2d_update_area (CoglTexture2D *texture,
struct wl_shm_buffer *shm_buffer,
int x,
int y,
int width,
int height)
{
CoglPixelFormat format;
shm_buffer_get_cogl_pixel_format (shm_buffer, &format, NULL);
cogl_texture_set_region (COGL_TEXTURE (texture),
x, y,
x, y,
width, height,
width, height,
format,
wl_shm_buffer_get_stride (shm_buffer),
wl_shm_buffer_get_data (shm_buffer));
}
CoglTexture2D *
cogl_wayland_texture_2d_new_from_buffer (CoglContext *ctx,
struct wl_resource *buffer,
CoglError **error)
{
struct wl_shm_buffer *shm_buffer;
shm_buffer = wl_shm_buffer_get (buffer);
if (shm_buffer)
{
int stride = wl_shm_buffer_get_stride (shm_buffer);
int width = wl_shm_buffer_get_width (shm_buffer);
int height = wl_shm_buffer_get_height (shm_buffer);
CoglPixelFormat format, internal_format;
shm_buffer_get_cogl_pixel_format (shm_buffer, &format, &internal_format);
return cogl_texture_2d_new_from_data (ctx, return cogl_texture_2d_new_from_data (ctx,
width, height, width, height,
format, format,

8
cogl/cogl-wayland-server.h
View File

@ -95,14 +95,6 @@ cogl_wayland_texture_2d_new_from_buffer (CoglContext *ctx,
struct wl_resource *buffer, struct wl_resource *buffer,
CoglError **error); CoglError **error);
void
cogl_wayland_texture_2d_update_area (CoglTexture2D *texture,
struct wl_shm_buffer *shm_buffer,
int x,
int y,
int width,
int height);
COGL_END_DECLS COGL_END_DECLS
/* The gobject introspection scanner seems to parse public headers in /* The gobject introspection scanner seems to parse public headers in