summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2016-02-18 11:06:40 -0600
committerDerek Foreman <derekf@osg.samsung.com>2016-03-07 19:45:37 -0600
commit570d503b701ef2b85af7803cd60eba55c1c7c0bc (patch)
tree41ccd977697460a17fddd63473fca0c9ad146922
parent766a2a80db98b839d5b862faf8ef4a9746a90976 (diff)
downloadenlightenment-devs/derekf/bm.tar.gz
Remove argb_convert for wayland buffersdevs/derekf/bm
Wayland buffers are currently either ARGB or XRGB - we don't need to convert either of these, we just need to set alpha appropriately - which we now do.
-rw-r--r--src/bin/e_pixmap.c31
1 files changed, 1 insertions, 30 deletions
diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index b25e8bb861..a2e504f7ac 100644
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -897,36 +897,7 @@ e_pixmap_image_data_argb_convert(E_Pixmap *cp, void *pix, void *ipix, Eina_Recta
break;
case E_PIXMAP_TYPE_WL:
if (cp->image_argb) return EINA_TRUE;
-#ifdef HAVE_WAYLAND
- if (cp->buffer)
- {
- struct wl_shm_buffer *shm_buffer;
- uint32_t format;
- int i, x, y;
- unsigned int *src, *dst;
-
- shm_buffer = cp->buffer->shm_buffer;
- if (!shm_buffer) return EINA_FALSE;
-
- format = wl_shm_buffer_get_format(shm_buffer);
- if (format == WL_SHM_FORMAT_XRGB8888)
- {
- dst = (unsigned int *)pix;
- src = (unsigned int *)ipix;
-
- for (y = 0; y < r->h; y++)
- {
- i = (r->y + y) * stride / 4 + r->x;
- for (x = 0; x < r->w; x++)
- dst[i+x] = 0xff000000 | src[i+x];
- }
- pix = (void *)dst;
- }
-
- return EINA_TRUE;
- }
-#endif
- break;
+ return EINA_FALSE;
default:
break;
}