[EGIT] [core/enlightenment] enlightenment-0.20 67/72: Remove argb_convert for wayland buffers

[Derek Foreman]

discomfitor pushed a commit to branch enlightenment-0.20.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=0959e59413233e427e587e2a69dee571740630bf

commit 0959e59413233e427e587e2a69dee571740630bf
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Thu Feb 18 11:06:40 2016 -0600

    Remove argb_convert for wayland buffers
    
    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.
---
 src/bin/e_pixmap.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index af7f852..555d4e7 100644
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -901,36 +901,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;
      }

--